bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas font: Fix initialization of ascent/descent for empty objects.

This commit is contained in:
Tom Hacohen 2013-06-07 18:09:30 +01:00
parent e1cffeecef
commit f2317ac875
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/evas/canvas/evas_object_text.c
View File

@ -2391,6 +2391,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
_evas_object_text_layout(eo_obj, o, text);
/* Calc ascent/descent. */
if (o->items)
{
Evas_Object_Text_Item *item;
@ -2411,10 +2412,16 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
if (desc > o->descent)
o->descent = desc;
o->max_ascent = o->ascent;
o->max_descent = o->descent;
}
}
else if (o->font)
{
o->ascent = ENFN->font_ascent_get(ENDT, o->font);
o->descent = ENFN->font_descent_get(ENDT, o->font);
}
o->max_ascent = o->ascent;
o->max_descent = o->descent;
if ((o->font) && (o->items))
{