Evas textblock: Fixed possible issue with word/mixed wrapping.

SVN revision: 57089
This commit is contained in:
Tom Hacohen 2011-02-16 13:00:41 +00:00
parent ff6e1d950e
commit 52807e1550
1 changed files with 8 additions and 2 deletions

View File

@ -3168,9 +3168,15 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
twrap = _layout_word_end(ti->text, wrap);
wrap = _layout_word_next(ti->text, wrap);
if (wrap >= 0)
return (str[wrap]) ? wrap : -1;
{
ch = GET_NEXT(str, wrap);
return (str[wrap]) ? wrap : -1;
}
else if (twrap >= 0)
return (str[twrap]) ? twrap : -1;
{
ch = GET_NEXT(str, twrap);
return (str[twrap]) ? twrap : -1;
}
}
}
return -1;