enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas textblock: Fixed a bug in mixed wrapping mode. 

SVN revision: 61440
This commit is contained in:
Tom Hacohen 2011-07-17 11:15:18 +00:00
parent 22eb580e59
commit 73a5f2277a
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3267,22 +3267,30 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
/* If we need to find the position after the cutting point */
if ((wrap == line_start) || (wrap_after))
{
while (wrap < len)
if (mixed_wrap)
{
if (ALLOW_BREAK(wrap))
break;
wrap++;
}
if ((wrap < len) && (wrap > line_start))
{
MOVE_NEXT_UNTIL(len, wrap);
return wrap;
return _layout_get_charwrap(c, fmt, ti,
line_start, breaks);
}
else
{
return -1;
while (wrap < len)
{
if (ALLOW_BREAK(wrap))
break;
wrap++;
}
if ((wrap < len) && (wrap > line_start))
{
MOVE_NEXT_UNTIL(len, wrap);
return wrap;
}
else
{
return -1;
}
}
}