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

Evas textblock: Fixed updating BiDi properties when we delete. 

SVN revision: 51801
This commit is contained in:
Tom Hacohen 2010-09-01 08:25:19 +00:00
parent eeafcb3be5
commit e6304cafaf
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4065,12 +4065,6 @@ _evas_textblock_nodes_merge(Evas_Object_Textblock *o, Evas_Object_Textblock_Node
text = eina_ustrbuf_string_get(from->unicode);
len = eina_ustrbuf_length_get(from->unicode);
eina_ustrbuf_append_length(to->unicode, text, len);
#ifdef BIDI_SUPPORT
/* Reset paragraph direction */
to->bidi_props.direction = EVAS_BIDI_PARAGRAPH_NATURAL;
evas_bidi_update_props(eina_ustrbuf_string_get(to->unicode),
&to->bidi_props);
#endif
itr = from->format_node;
if (itr && (itr->text_node == from))
@ -6073,6 +6067,12 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
{
_evas_textblock_cursor_nodes_merge(cur);
}
#ifdef BIDI_SUPPORT
/* Reset paragraph direction */
n->bidi_props.direction = EVAS_BIDI_PARAGRAPH_NATURAL;
evas_bidi_update_props(eina_ustrbuf_string_get(n->unicode),
&n->bidi_props);
#endif
if (cur->pos == eina_ustrbuf_length_get(n->unicode))
{
@ -6166,8 +6166,18 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
if (should_merge)
{
/* We call this function instead of the cursor one because we already
* updated the cursors */
_evas_textblock_nodes_merge(o, n1);
}
#ifdef BIDI_SUPPORT
/* Reset paragraph direction */
n1->bidi_props.direction = EVAS_BIDI_PARAGRAPH_NATURAL;
evas_bidi_update_props(eina_ustrbuf_string_get(n1->unicode),
&n1->bidi_props);
#endif
evas_textblock_cursor_copy(cur1, cur2);
evas_textblock_cursor_copy(cur1, o->cursor);
_evas_textblock_changed(o, cur1->obj);