dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas textblock: Fixed issues when deleting some ranges. 

An example broken range: "A<ps/><b>B</b>".
Many thanks to WooHyun for reporting this and providing most of the fix.

SVN revision: 78105
This commit is contained in:
Tom Hacohen 2012-10-17 06:58:38 +00:00
parent b284a80e76
commit 03e291eebb
2 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6801,7 +6801,6 @@ _evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o,
Evas_Object_Textblock_Node_Text *n, size_t start, int end)
{
Evas_Object_Textblock_Node_Format *last_node, *itr;
Evas_Object_Textblock_Node_Text *new_node;
int use_end = 1;
int delta = 0;
int first = 1;
@ -6822,21 +6821,6 @@ _evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o,
end--;
}
/* If we are not removing the text node, all should stay in this text
* node, otherwise, everything should move to the previous node */
if ((start == 0) && !use_end)
{
new_node = _NODE_TEXT(EINA_INLIST_GET(n)->prev);
if (!new_node)
{
new_node = n;
}
}
else
{
new_node = n;
}
/* Find the first node after start */
while (itr && (itr->text_node == n))
{
@ -6894,7 +6878,6 @@ _evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o,
}
}
last_node->text_node = new_node;
}
return EINA_FALSE;
@ -7833,17 +7816,7 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
{
should_merge = EINA_TRUE;
}
else
{
n = _NODE_TEXT(EINA_INLIST_GET(n1)->prev);
/* Short path */
if (!n)
{
/* Clear the whole textblock - do it nicer. */
evas_object_textblock_text_markup_set(cur1->obj, "");
return;
}
}
_evas_textblock_node_text_adjust_offsets_to_start(o, n1, cur1->pos, -1);
}
else
{
@ -7857,7 +7830,6 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
{
Evas_Object_Textblock_Node_Text *n;
int len;
_evas_textblock_node_text_adjust_offsets_to_start(o, n1, cur1->pos, -1);
n = _NODE_TEXT(EINA_INLIST_GET(n1)->next);
/* Remove all the text nodes between */
while (n && (n != n2))
@ -7865,10 +7837,13 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
Evas_Object_Textblock_Node_Text *nnode;
nnode = _NODE_TEXT(EINA_INLIST_GET(n)->next);
_evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1);
_evas_textblock_nodes_merge(o, n1);
n = nnode;
}
/* After we merged all the nodes, move the formats to the start of
* the range. */
_evas_textblock_node_text_adjust_offsets_to_start(o, n1, cur1->pos, -1);
should_merge = _evas_textblock_node_text_adjust_offsets_to_start(o, n2,
0, cur2->pos);

11
legacy/evas/src/tests/evas_test_textblock.c
View File

@ -807,6 +807,17 @@ START_TEST(evas_textblock_format_removal)
fnode = evas_textblock_node_format_first_get(tb);
fail_if(fnode);
/* Deleting a range with just one char and surrounded by formats, that
* deletes a paragraph. */
evas_object_textblock_text_markup_set(tb, "A<ps/><b>B</b>");
evas_textblock_cursor_pos_set(cur, 2);
evas_textblock_cursor_pos_set(main_cur, 3);
evas_textblock_cursor_range_delete(cur, main_cur);
fnode = evas_textblock_node_format_first_get(tb);
fnode = evas_textblock_node_format_next_get(fnode);
fail_if (fnode);
/* Two formats in the same place. */
evas_object_textblock_text_markup_set(tb, "a<b><a>b</a></b>b");
evas_textblock_cursor_pos_set(cur, 1);