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

evas_textblock: reduce _evas_textblock_changed calls with markup_text_append 

**_evas_textblock_changed** is internal function that mark that the textblock has changed.

When make call for
evas_object_textblock_text_markup_set(txtblock,"This is Line<br>THis is other Line<br>");

Old behaviour:
multible calles for _evas_textblock_changed will happend, for each text/format appended.

New behaviour:
Single call for _evas_textblock_changed will happend.

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D9376
This commit is contained in:
Ali Alzyod 2019-07-22 15:25:17 +00:00 committed by Cedric BAIL
parent ed22ad99a3
commit 1d76452aa9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -657,6 +657,7 @@ struct _Evas_Object_Textblock
} gfx_filter; } gfx_filter;
Eina_Bool redraw : 1; Eina_Bool redraw : 1;
Eina_Bool changed : 1; Eina_Bool changed : 1;
Eina_Bool pause_change : 1;
Eina_Bool obstacle_changed : 1; Eina_Bool obstacle_changed : 1;
Eina_Bool content_changed : 1; Eina_Bool content_changed : 1;
Eina_Bool format_changed : 1; Eina_Bool format_changed : 1;
@ -8075,6 +8076,10 @@ _evas_object_textblock_text_markup_prepend(Eo *eo_obj,
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
evas_object_async_block(obj); evas_object_async_block(obj);
TB_HEAD(); TB_HEAD();
/* Stop calls for _evas_textblock_changed for each cursor_text_append or cursor_format_append
* this should be done once, when markup_prepend finished */
o->pause_change = EINA_TRUE;
if (text) if (text)
{ {
char *s, *p; char *s, *p;
@ -8189,6 +8194,7 @@ _evas_object_textblock_text_markup_prepend(Eo *eo_obj,
p++; p++;
} }
} }
o->pause_change = EINA_FALSE;
_evas_textblock_changed(o, eo_obj); _evas_textblock_changed(o, eo_obj);
} }
@ -10996,7 +11002,8 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *_tex
/* Update all the cursors after our position. */ /* Update all the cursors after our position. */
_evas_textblock_cursors_update_offset(cur, cur->node, cur->pos, len); _evas_textblock_cursors_update_offset(cur, cur->node, cur->pos, len);
_evas_textblock_changed(o, cur->obj); if (!o->pause_change)
_evas_textblock_changed(o, cur->obj);
n->dirty = EINA_TRUE; n->dirty = EINA_TRUE;
free(text); free(text);
@ -11342,7 +11349,8 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur,
o->format_changed = EINA_TRUE; o->format_changed = EINA_TRUE;
} }
_evas_textblock_changed(o, cur->obj); if (!o->pause_change)
_evas_textblock_changed(o, cur->obj);
Efl_Text_Cursor_Cursor *ocur = o->cursor; Efl_Text_Cursor_Cursor *ocur = o->cursor;
if (!ocur->node) if (!ocur->node)