From c7c8c0b3eb90ceb7b01eb958494c1c34cb13af22 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sat, 27 Jan 2018 17:57:43 +0100 Subject: [PATCH] efl_ui_focus_composition: remove elements_flush this can also be done when calling prepare_logical --- src/lib/elementary/efl_ui_focus_composition.c | 16 +++++----------- src/lib/elementary/efl_ui_focus_composition.eo | 4 ---- 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 c5792a3..ab3c6eb 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 028b1db..11e632b 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 @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 ca2598c..b5babe1 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) -- 2.7.4