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

Evas textblock: fix deleting the first tab in 'a<TAB><TAB>a' that caused weird behavior. 

The solution is that we only delete invisible standalones now, not visible ones, this is correct intuitively and of course fixes the bug.

SVN revision: 52302
This commit is contained in:
Tom Hacohen 2010-09-15 14:07:09 +00:00
parent b59743febd
commit 612b3eda81
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4823,7 +4823,9 @@ _evas_textblock_cursor_node_text_at_format(Evas_Textblock_Cursor *cur, Evas_Obje
/**
* @internal
* Remove pairs of + and - formats and also remove formats without + or -
* i.e formats that pair to themselves
* i.e formats that pair to themselves. Only removes invisible formats
* that pair themselves, if you want to remove invisible formats that pair
* themselves, please first change fmt->visible to EINA_FALSE.
*
* @param o the textblock object.
* @param fmt the current format.
@ -4867,7 +4869,7 @@ _evas_textblock_node_format_remove_matching(Evas_Object_Textblock *o,
_evas_textblock_node_format_remove(o, fmt, 0);
}
}
else
else if (!fmt->visible)
{
_evas_textblock_node_format_remove(o, fmt, 0);
}
@ -4958,7 +4960,7 @@ _evas_textblock_node_format_remove(Evas_Object_Textblock *o, Evas_Object_Textblo
/**
* @internal
* Sets all the offsets of the format nodes between start and end in the text
* node n to 0.
* node n to 0 and sets visibility to EINA_FALSE.
* If end == -1 end means the end of the string.
*
* @param n the text node the positinos refer to.
@ -5042,6 +5044,7 @@ _evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o,
if (!first)
{
last_node->offset = 0;
last_node->visible = EINA_FALSE;
}
else
{
@ -5928,6 +5931,11 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
{
merge_nodes = 1;
}
/* If a singnular, mark as invisible, so we'll delete it. */
if (!format || ((*format != '+') && (*format != '-')))
{
fmt->visible = EINA_FALSE;
}
}
fmt2 = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);