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

Evas textblock: Fixed removing of format pairs in a rare case. 

Until now, removing the <ps> when <b><ps></b> would have left the <b></b>
intact instead of removing them.

SVN revision: 61529
This commit is contained in:
Tom Hacohen 2011-07-20 15:45:12 +00:00
parent 92c22656d8
commit 412b203b46
1 changed files with 4 additions and 9 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

@ -6898,7 +6898,6 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
{
Evas_Object_Textblock *o;
Evas_Object_Textblock_Node_Text *n, *n2;
int merge_nodes = 0;
const Eina_Unicode *text;
int chr, ind, ppos;
@ -6915,6 +6914,7 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
if (chr == 0) return;
ppos = cur->pos;
eina_ustrbuf_remove(n->unicode, cur->pos, ind);
/* Remove a format node if needed, and remove the char only if the
* fmt node is not visible */
{
@ -6929,7 +6929,9 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
format = last_fmt->format;
if (format && _IS_PARAGRAPH_SEPARATOR(o, format))
{
merge_nodes = 1;
/* 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);
}
/* If a singnular, mark as invisible, so we'll delete it. */
if (!format || ((*format != '+') && (*format != '-')))
@ -6945,13 +6947,6 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
_evas_textblock_node_format_remove_matching(o, fmt);
}
eina_ustrbuf_remove(n->unicode, cur->pos, ind);
/* If it was a paragraph separator, we should merge the current with the
* next, there must be a next. */
if (merge_nodes)
{
_evas_textblock_cursor_nodes_merge(cur);
}
if (cur->pos == eina_ustrbuf_length_get(n->unicode))
{