diff options
| author | Marcel Hollerbach <marcel@osg.samsung.com> | 2018-01-27 17:57:43 +0100 |
|---|---|---|
| committer | Marcel Hollerbach <marcel@osg.samsung.com> | 2018-01-31 14:21:37 +0100 |
| commit | 2fc1d7e3c7ed97806b66dc2dba8bb90ca0fcd858 (patch) | |
| tree | c905626ca9c5992b71eb6e03eff4738b5781b493 | |
| parent | 211093b7c52361f38fd0fa089ebb0c3d6fd1afe6 (diff) | |
| download | efl-2fc1d7e3c7ed97806b66dc2dba8bb90ca0fcd858.tar.gz | |
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.c | 16 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_focus_composition.eo | 4 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_focus_parent_provider_gen.c | 2 |
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 } EOLIAN static void -_efl_ui_focus_composition_elements_flush(Eo *obj, Efl_Ui_Focus_Composition_Data *pd) -{ - if (!pd->dirty) return; - - efl_ui_focus_composition_prepare(obj); - - pd->dirty = EINA_FALSE; -} - -EOLIAN static void _efl_ui_focus_composition_efl_ui_focus_object_prepare_logical(Eo *obj, Efl_Ui_Focus_Composition_Data *pd EINA_UNUSED) { - efl_ui_focus_composition_elements_flush(obj); + if (pd->dirty) + { + efl_ui_focus_composition_prepare(obj); + pd->dirty = EINA_FALSE; + } efl_ui_focus_object_prepare_logical(efl_super(obj, MY_CLASS)); } 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) { logical_order : list<Efl.Gfx> @owned; [[The order to use]] } } - elements_flush { - [[Function that will emit prepare if this is marked as dirty]] - } - dirty @protected { [[ Mark this widget as dirty, the children can be considered to be changed after that call ]] 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 item = eina_hash_find(pd->map, &above_gengrid); - efl_ui_focus_composition_elements_flush(pd->container); + efl_ui_focus_object_prepare_logical(pd->container); // We dont have a map entry if (!item) |