From da2c25014f6406d83b8e3adf6b8f7aefd7f2dc9e Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 30 Jan 2011 10:43:03 +0000 Subject: [PATCH] Evas font-engine: Exposed PEN_Y in the walker functions and started using it instead of the hackish _pen_y. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@56516 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/engines/common/evas_font_draw.c | 6 ++---- src/lib/engines/common/evas_font_private.h | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/engines/common/evas_font_draw.c b/src/lib/engines/common/evas_font_draw.c index 3f07f8f..05b5700 100644 --- a/src/lib/engines/common/evas_font_draw.c +++ b/src/lib/engines/common/evas_font_draw.c @@ -504,8 +504,6 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font } - /*FIXME: Handle it sanely */ - _pen_y = y; im = dst->image.data; #ifdef OT_SUPPORT if (evas_common_font_ot_is_enabled() && intl_props->ot_data) @@ -524,7 +522,7 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font } chr_x = x + EVAS_FONT_WALK_PEN_X + EVAS_FONT_WALK_OT_X_OFF + EVAS_FONT_WALK_OT_X_BEAR; - chr_y = (_pen_y) + EVAS_FONT_WALK_OT_Y_OFF + EVAS_FONT_WALK_OT_Y_BEAR; + chr_y = y + EVAS_FONT_WALK_PEN_Y + EVAS_FONT_WALK_OT_Y_OFF + EVAS_FONT_WALK_OT_Y_BEAR; chr_w = EVAS_FONT_WALK_OT_WIDTH; if (chr_x < (ext_x + ext_w)) @@ -673,7 +671,7 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font } chr_x = x + EVAS_FONT_WALK_PEN_X + EVAS_FONT_WALK_DEFAULT_X_OFF + EVAS_FONT_WALK_DEFAULT_X_BEAR; - chr_y = (_pen_y) + EVAS_FONT_WALK_DEFAULT_Y_OFF + EVAS_FONT_WALK_DEFAULT_Y_BEAR; + chr_y = y + EVAS_FONT_WALK_PEN_Y + EVAS_FONT_WALK_DEFAULT_Y_OFF + EVAS_FONT_WALK_DEFAULT_Y_BEAR; chr_w = EVAS_FONT_WALK_DEFAULT_WIDTH; if (chr_x < (ext_x + ext_w)) diff --git a/src/lib/engines/common/evas_font_private.h b/src/lib/engines/common/evas_font_private.h index 3ff8df7..0964359 100644 --- a/src/lib/engines/common/evas_font_private.h +++ b/src/lib/engines/common/evas_font_private.h @@ -74,5 +74,6 @@ void evas_common_font_int_reload(RGBA_Font_Int *fi); (void) _pen_y; /* Sometimes it won't be used */ # define EVAS_FONT_WALK_PEN_X (EVAS_FONT_ROUND_26_6_TO_INT(_pen_x)) +# define EVAS_FONT_WALK_PEN_Y (EVAS_FONT_ROUND_26_6_TO_INT(_pen_y)) #endif /* !_EVAS_FONT_PRIVATE_H */ -- 2.7.4