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

Evas textblock: Fix handling of newline in compatiblity mode. 

This fixes an issue with newlines that were shoved in the middle of
other format parts like <font_size=46 \n>.

SVN revision: 58457
This commit is contained in:
Tom Hacohen 2011-04-07 15:25:19 +00:00
parent 87bba22028
commit c9290ef41d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2994,11 +2994,7 @@ _layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c,
{
Evas_Object_Textblock_Format_Item *fi;
/* If in compatible mode, insert a ps */
if (c->o->newline_is_ps)
fi = _layout_format_item_add(c, n, "ps", fmt);
else
fi = _layout_format_item_add(c, n, item, fmt);
fi = _layout_format_item_add(c, n, item, fmt);
fi->parent.w = fi->parent.adv = 0;
}
@ -3416,7 +3412,12 @@ _layout_visualize_par(Ctxt *c)
Evas_Object_Textblock_Format_Item *fi;
fi = _ITEM_FORMAT(it);
fi->y = c->y;
if (fi->item && _IS_LINE_SEPARATOR(fi->item))
/* If it's a newline, and we are not in newline compat
* mode, or we are in newline compat mode, and this is
* not used as a paragraph separator, advance */
if (fi->item && _IS_LINE_SEPARATOR(fi->item) &&
(!c->o->newline_is_ps ||
eina_list_next(i)))
{
adv_line = 1;
}