parent
d8ae422259
commit
7c66538545
|
@ -1858,7 +1858,8 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
|
||||||
c->marginl - c->marginr)))
|
c->marginl - c->marginr)))
|
||||||
{
|
{
|
||||||
wrap = _layout_text_cutoff_get(c, fmt, it);
|
wrap = _layout_text_cutoff_get(c, fmt, it);
|
||||||
if (wrap == 0) wrap = 1;
|
if (wrap == 0)
|
||||||
|
evas_common_font_utf8_get_next((unsigned char *)str, &wrap);
|
||||||
if (wrap > 0)
|
if (wrap > 0)
|
||||||
{
|
{
|
||||||
if (fmt->wrap_word)
|
if (fmt->wrap_word)
|
||||||
|
@ -1897,6 +1898,8 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
|
||||||
if (it->text) free(it->text);
|
if (it->text) free(it->text);
|
||||||
_format_free(c->obj, it->format);
|
_format_free(c->obj, it->format);
|
||||||
free(it);
|
free(it);
|
||||||
|
if (c->ln->items)
|
||||||
|
{
|
||||||
it = (Evas_Object_Textblock_Item *)(EINA_INLIST_GET(c->ln->items))->last;
|
it = (Evas_Object_Textblock_Item *)(EINA_INLIST_GET(c->ln->items))->last;
|
||||||
_layout_strip_trailing_whitespace(c, fmt, it);
|
_layout_strip_trailing_whitespace(c, fmt, it);
|
||||||
twrap = _layout_word_end(str, wrap);
|
twrap = _layout_word_end(str, wrap);
|
||||||
|
@ -1905,6 +1908,7 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* wrap now is the index of the word START */
|
/* wrap now is the index of the word START */
|
||||||
|
|
Loading…
Reference in New Issue