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

Evas textblock: Fixed native size calculation.

This commit is contained in:
Tom Hacohen 2013-09-20 17:59:44 +01:00
parent 2173652b4d
commit 2ab088aeea
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -10355,8 +10355,16 @@ _size_native_calc_line_finalize(const Evas_Object *eo_obj, Eina_List *items,
}
else
{
Evas_Coord maxasc = 0, maxdesc = 0;
_layout_item_ascent_descent_adjust(eo_obj, ascent, descent,
it, it->format);
_layout_item_max_ascent_descent_calc(eo_obj, &maxasc, &maxdesc,
it, position);
if (maxasc > *ascent)
*ascent = maxasc;
if (maxdesc > *descent)
*descent = maxdesc;
}
loop_advance:
@ -10420,10 +10428,16 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
}
}
*position = (*position == TEXTBLOCK_POSITION_START) ?
TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END;
if (!EINA_INLIST_GET(par)->next)
{
*position = (*position == TEXTBLOCK_POSITION_START) ?
TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END;
}
_size_native_calc_line_finalize(eo_obj, line_items, &ascent, &descent, &w, *position);
if (*position == TEXTBLOCK_POSITION_START)
*position = TEXTBLOCK_POSITION_ELSE;
line_items = eina_list_free(line_items);
/* Do the last addition */