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

avoid infinite loop more aggressively? 

and some more optimising...


SVN revision: 13170
This commit is contained in:
Carsten Haitzler 2005-02-01 13:53:40 +00:00
parent e9f525ece0
commit d4d3ee146e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,7 +518,7 @@ evas_object_textblock_layout(Evas_Object *obj)
/* FIXME: if we overflow then this would be punted to an overflow */
/* object instead */
if (layout.line.y >= h) return;
if (layout.line.y >= h) goto breakout;
node = (Node *)l;
// printf("NODE: FMT:\"%s\" TXT:\"%s\"\n", node->format, node->text);
if (node->format)
@ -547,6 +547,11 @@ evas_object_textblock_layout(Evas_Object *obj)
text = strdup(node->text);
new_node:
if (layout.line.y >= h)
{
free(text);
goto breakout;
}
lnode = calloc(1, sizeof(Layout_Node));
evas_object_textblock_layout_copy(&layout, &(lnode->layout));
if (lnode->layout.font.name)
@ -665,14 +670,18 @@ evas_object_textblock_layout(Evas_Object *obj)
{
/* FIXME: this node would overflow to the next textblock */
}
layout.line.y += lnode->layout.line.mascent + lnode->layout.line.mdescent;
layout.line.y += layout.line.mascent + layout.line.mdescent;
text = text2;
/* still more text to go */
goto new_node;
if ((layout.line.mascent + layout.line.mdescent) > 0)
goto new_node;
else
free(text);
}
}
}
}
breakout:
evas_object_textblock_layout_clear(obj, &layout);
}