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

evas text - fix text object expanding when it gets some unicode in it 

the text object walked all text items and took the biggest. when that
big item used some fallback font that didnt match the primary font in
ascent/descent etc. things went wrong - text expanded when not
expected to. this makes text objects just use the primary font
ascent/descent metrics and fixes e titlebar magically expanding thus
compressing window content when not expected.
This commit is contained in:
Carsten Haitzler 2014-08-17 22:22:44 +09:00
parent 396433bbc2
commit 0987f06e6b
1 changed files with 10 additions and 1 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

@ -2236,6 +2236,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
/* Calc ascent/descent. */
if (o->items)
{
/*
Evas_Object_Text_Item *item;
for (item = o->items ; item ;
@ -2244,7 +2245,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
{
int asc = 0, desc = 0;
/* Skip items without meaning full information. */
// Skip items without meaning full information.
if (!item->text_props.font_instance) continue;
asc = evas_common_font_instance_ascent_get(item->text_props.font_instance);
@ -2257,6 +2258,14 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
if (asc > o->max_ascent) o->max_ascent = asc;
if (desc > o->max_descent) o->max_descent = desc;
}
*/
if (o->font)
{
o->ascent = ENFN->font_ascent_get(ENDT, o->font);
o->descent = ENFN->font_descent_get(ENDT, o->font);
o->max_ascent = ENFN->font_max_ascent_get(ENDT, o->font);
o->max_descent = ENFN->font_max_descent_get(ENDT, o->font);
}
}
else if (o->font)
{