summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-01-27 17:57:43 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-01-31 14:21:37 +0100
commit2fc1d7e3c7ed97806b66dc2dba8bb90ca0fcd858 (patch)
treec905626ca9c5992b71eb6e03eff4738b5781b493
parent211093b7c52361f38fd0fa089ebb0c3d6fd1afe6 (diff)
efl_ui_focus_composition: remove elements_flush
this can also be done when calling prepare_logical
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c16
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.c2
3 files changed, 6 insertions, 16 deletions
diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c
index c5792a3953..ab3c6eb963 100644
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -155,19 +155,13 @@ _efl_ui_focus_composition_dirty(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Da
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
158_efl_ui_focus_composition_elements_flush(Eo *obj, Efl_Ui_Focus_Composition_Data *pd)
159{
160 if (!pd->dirty) return;
161
162 efl_ui_focus_composition_prepare(obj);
163
164 pd->dirty = EINA_FALSE;
165}
166
167EOLIAN static void
168_efl_ui_focus_composition_efl_ui_focus_object_prepare_logical(Eo *obj, Efl_Ui_Focus_Composition_Data *pd EINA_UNUSED) 158_efl_ui_focus_composition_efl_ui_focus_object_prepare_logical(Eo *obj, Efl_Ui_Focus_Composition_Data *pd EINA_UNUSED)
169{ 159{
170 efl_ui_focus_composition_elements_flush(obj); 160 if (pd->dirty)
161 {
162 efl_ui_focus_composition_prepare(obj);
163 pd->dirty = EINA_FALSE;
164 }
171 165
172 efl_ui_focus_object_prepare_logical(efl_super(obj, MY_CLASS)); 166 efl_ui_focus_object_prepare_logical(efl_super(obj, MY_CLASS));
173} 167}
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index 028b1db1ff..11e632bca8 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -19,10 +19,6 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
19 logical_order : list<Efl.Gfx> @owned; [[The order to use]] 19 logical_order : list<Efl.Gfx> @owned; [[The order to use]]
20 } 20 }
21 } 21 }
22 elements_flush {
23 [[Function that will emit prepare if this is marked as dirty]]
24 }
25
26 dirty @protected { 22 dirty @protected {
27 [[ Mark this widget as dirty, the children can be considered to be changed after that call 23 [[ Mark this widget as dirty, the children can be considered to be changed after that call
28 ]] 24 ]]
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c
index ca2598c049..b5babe133c 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c
@@ -63,7 +63,7 @@ _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_pare
63 63
64 item = eina_hash_find(pd->map, &above_gengrid); 64 item = eina_hash_find(pd->map, &above_gengrid);
65 65
66 efl_ui_focus_composition_elements_flush(pd->container); 66 efl_ui_focus_object_prepare_logical(pd->container);
67 67
68 // We dont have a map entry 68 // We dont have a map entry
69 if (!item) 69 if (!item)