From a9436cd5cfc04c777a1c88be414f28c5c450718d Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 30 Jan 2011 10:44:17 +0000 Subject: [PATCH] Evas text: Fixed vert advance get in cases of mixed scripts with different ascents/descents. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56527 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_text.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c index b2f0ea6..873a3ae 100644 --- a/src/lib/canvas/evas_object_text.c +++ b/src/lib/canvas/evas_object_text.c @@ -260,24 +260,10 @@ _evas_object_text_horiz_advance_get(const Evas_Object *obj, /* FIXME: doc */ static Evas_Coord -_evas_object_text_vert_advance_get(const Evas_Object *obj, +_evas_object_text_vert_advance_get(const Evas_Object *obj __UNUSED__, const Evas_Object_Text *o) { - Evas_Object_Text_Item *it; - Evas_Coord adv; - - adv = 0; - EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) - { - Evas_Coord tmp; - tmp = ENFN->font_v_advance_get(ENDT, o->engine_data, it->text, - &it->text_props); - if (tmp > adv) - { - adv = tmp; - } - } - return adv; + return o->max_ascent + o->max_descent; } /* FIXME: returns the advance instead of the width just because it's usuallly -- 2.7.4