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

Evas textblock: Fixed updating of formats position on char_delete. 

Format offsets got wrong when merging paragraphs.

SVN revision: 61638
This commit is contained in:
Tom Hacohen 2011-07-24 08:50:42 +00:00
parent e6bdceb300
commit 53fc933312
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6924,6 +6924,7 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
/* Remove a format node if needed, and remove the char only if the
* fmt node is not visible */
{
Eina_Bool should_merge = EINA_FALSE;
Evas_Object_Textblock_Node_Format *fmt, *fmt2;
fmt = _evas_textblock_cursor_node_format_at_pos_get(cur);
if (fmt)
@ -6937,7 +6938,7 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
{
/* If it was a paragraph separator, we should merge the
* current with the next, there must be a next. */
_evas_textblock_cursor_nodes_merge(cur);
should_merge = EINA_TRUE;
}
/* If a singnular, mark as invisible, so we'll delete it. */
if (!format || ((*format != '+') && (*format != '-')))
@ -6951,6 +6952,11 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
_evas_textblock_node_format_adjust_offset(o, cur->node, fmt2,
-(ind - cur->pos));
if (should_merge)
{
_evas_textblock_cursor_nodes_merge(cur);
}
_evas_textblock_node_format_remove_matching(o, fmt);
}