diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2008-12-24 17:29:21 -0500 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2008-12-24 17:29:21 -0500 |
commit | b2f89625453e2a15da175ea5b4ca5af6c2201d96 (patch) | |
tree | e4884561739edf4e2b7f35e031a6f46f62984376 /src/cairo-font-face-twin.c | |
parent | f980d017d2360634f391eb1129317446bfe42cc9 (diff) | |
download | cairo-b2f89625453e2a15da175ea5b4ca5af6c2201d96.tar.gz |
[twin] Adjust baseline
Diffstat (limited to 'src/cairo-font-face-twin.c')
-rw-r--r-- | src/cairo-font-face-twin.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/cairo-font-face-twin.c b/src/cairo-font-face-twin.c index 8fb1a1d86..425f6fd48 100644 --- a/src/cairo-font-face-twin.c +++ b/src/cairo-font-face-twin.c @@ -221,9 +221,6 @@ FREE_PROPS: #define twin_glyph_snap_y(g) (twin_glyph_snap_x(g) + twin_glyph_n_snap_x(g)) #define twin_glyph_draw(g) (twin_glyph_snap_y(g) + twin_glyph_n_snap_y(g)) -#define SNAPI(p) (p) -#define SNAPH(p) (p) - #define FX(g) ((g) / 72.) #define FY(g) ((g) / 72.) @@ -233,7 +230,7 @@ twin_scaled_font_init (cairo_scaled_font_t *scaled_font, cairo_t *cr, cairo_font_extents_t *metrics) { - metrics->ascent = FY (52); + metrics->ascent = FY (54); metrics->descent = 1 - metrics->ascent; return CAIRO_STATUS_SUCCESS; } @@ -308,8 +305,8 @@ twin_scaled_font_render_glyph (cairo_scaled_font_t *scaled_font, /* lock pen matrix */ cairo_save (cr); - /* left margin + pen width */ - cairo_translate (cr, lw * 1.5, 0); + /* left margin + pen width, pen width */ + cairo_translate (cr, lw * 1.5, -lw * .5); /* slant */ if (props->slant != CAIRO_FONT_SLANT_NORMAL) { @@ -339,7 +336,7 @@ twin_scaled_font_render_glyph (cairo_scaled_font_t *scaled_font, metrics->x_advance = gw + lw * 3; /* pen width + margin */ metrics->x_advance *= stretch; if (info.snap) - metrics->x_advance = SNAPI (SNAPX (metrics->x_advance)); + metrics->x_advance = SNAPX (metrics->x_advance); /* glyph shape */ |