From 0e0ba10a7de387737d2f86cfbdff7a91a2919847 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:38:33 +0000 Subject: [PATCH] Evas font-engine: fixed kerning in the default walker. SVN revision: 56473 --- .../lib/engines/common/evas_font_default_walk.x | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x b/legacy/evas/src/lib/engines/common/evas_font_default_walk.x index 1d1402be4e..78b85cdfe2 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x +++ b/legacy/evas/src/lib/engines/common/evas_font_default_walk.x @@ -20,13 +20,13 @@ if (intl_props && (intl_props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) && \ visible && !is_visual) \ { \ - if (!evas_common_font_query_kerning(fi, index, prev_index, &kern)) \ - kern = 0; \ + if (evas_common_font_query_kerning(fi, index, prev_index, &kern)) \ + pen_x += kern; \ } \ else \ { \ - if (!evas_common_font_query_kerning(fi, prev_index, index, &kern)) \ - kern = 0; \ + if (evas_common_font_query_kerning(fi, prev_index, index, &kern)) \ + pen_x += kern; \ } \ } \ while (0) @@ -35,8 +35,8 @@ do \ { \ (void) is_visual; \ - if (!evas_common_font_query_kerning(fi, prev_index, index, &kern)) \ - kern = 0; \ + if (evas_common_font_query_kerning(fi, prev_index, index, &kern)) \ + pen_x += kern; \ } \ while (0) #endif @@ -109,7 +109,7 @@ if (_gl == 0) break; /*FIXME: doc */ -#define EVAS_FONT_WALK_DEFAULT_X_OFF (kern) +#define EVAS_FONT_WALK_DEFAULT_X_OFF (0) #define EVAS_FONT_WALK_DEFAULT_Y_OFF (0) #define EVAS_FONT_WALK_DEFAULT_X_BEAR (fg->glyph_out->left) #define EVAS_FONT_WALK_DEFAULT_Y_BEAR (fg->glyph_out->top)