qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-23 01:32:49 +02:00
Code

eeshow/gfx/cro.c (cr_text_width): use cd/dc, not cx/xc

Browse Source 
We don't want to risk getting sheet offsets mixed into our text sizes.
This commit is contained in:
Werner Almesberger 2016-08-20 09:24:27 -03:00
parent adfb52d12d
commit c06680e272
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeshow/gfx/cro.c
View File

@ -66,15 +66,15 @@ static inline int cd(const struct cro_ctx *cc, int x)
} }
static inline int cx(const struct cro_ctx *cc, int x) static inline int dc(const struct cro_ctx *cc, int x)
{ {
return cc->xo + (x + cc->xe) * cc->scale; return x / cc->scale;
} }
static inline int xc(const struct cro_ctx *cc, int x) static inline int cx(const struct cro_ctx *cc, int x)
{ {
return (x - cc->xo) / cc->scale - cc->xe; return cc->xo + (x + cc->xe) * cc->scale;
} }
@ -230,9 +230,9 @@ static unsigned cr_text_width(void *ctx, const char *s, unsigned size)
struct cro_ctx *cc = ctx; struct cro_ctx *cc = ctx;
cairo_text_extents_t ext; cairo_text_extents_t ext;
cairo_set_font_size(cc->cr, cx(cc, size) * TEXT_STRETCH); cairo_set_font_size(cc->cr, cd(cc, size) * TEXT_STRETCH);
cairo_text_extents(cc->cr, s, &ext); cairo_text_extents(cc->cr, s, &ext);
return xc(cc, ext.width) * 1.05; /* @@@ Cairo seems to underestimate */ return dc(cc, ext.width) * 1.05; /* @@@ Cairo seems to underestimate */
} }