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

Evas textblock: Fix formatted size calculation with ellipsis. 

SVN revision: 58580
This commit is contained in:
Tom Hacohen 2011-04-12 07:13:33 +00:00
parent eb99563451
commit 892994005b
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -3725,6 +3725,8 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
/* Start of visual layout creation */
{
Evas_Object_Textblock_Paragraph *last_vis_par = NULL;
EINA_INLIST_FOREACH(c->paragraphs, c->par)
{
_layout_update_par(c);
@ -3732,18 +3734,31 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
/* Break if we should stop here. */
if (_layout_visualize_par(c))
{
/* Mark all the rest of the paragraphs as invisible */
c->par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->par)->next;
while (c->par)
{
c->par->visible = 0;
c->par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->par)->next;
}
last_vis_par = c->par;
break;
}
}
/* Mark all the rest of the paragraphs as invisible */
if (c->par)
{
c->par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->par)->next;
while (c->par)
{
c->par->visible = 0;
c->par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->par)->next;
}
}
/* Get the last visible paragraph in the layout */
if (!last_vis_par && c->paragraphs)
last_vis_par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->paragraphs)->last;
if (last_vis_par)
c->hmax = last_vis_par->y + last_vis_par->h;
}
/* Clean the rest of the format stack */
@ -3754,14 +3769,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
_format_unref_free(c->obj, fmt);
}
if (c->paragraphs)
{
Evas_Object_Textblock_Paragraph *last_par;
last_par = (Evas_Object_Textblock_Paragraph *)
EINA_INLIST_GET(c->paragraphs)->last;
c->hmax = last_par->y + last_par->h;
}
if (w_ret) *w_ret = c->wmax;
if (h_ret) *h_ret = c->hmax;