devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ae894a0509e0c1db1dc94ce5b959028b28639fd1
commit ae894a0509e0c1db1dc94ce5b959028b28639fd1 Author: Chris Michael <[email protected]> Date: Fri Aug 17 11:34:30 2018 -0400 Revert this patch. It was not supposed to land yet as it was awaiting review Revert "elementary: Check for valid focus manager before starting do loop" This reverts commit 364ca1d2b2bb057da4d4d02dbeb2cbc2045b0ee3. --- src/lib/elementary/efl_ui_focus_util.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c index 4dc7c3ad49..aa342a92f4 100644 --- a/src/lib/elementary/efl_ui_focus_util.c +++ b/src/lib/elementary/efl_ui_focus_util.c @@ -31,14 +31,6 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus registered_manager = m = efl_ui_focus_object_focus_manager_get(user); entry = user; - if (!m) - { - //delayed focusung - efl_key_data_set(top, "__delayed_focus_set", entry); - efl_event_callback_add(entry, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, user); - return; - } - do { //check if the root of a manager is the window root, set focus to this object in the manager than entry = efl_ui_focus_manager_root_get(m); @@ -51,6 +43,13 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus //if there is no manager yet, delay the focus setting until this entity gets registered for one chain m = efl_ui_focus_object_focus_manager_get(entry); + if (!m) + { + //delayed focusung + efl_key_data_set(top, "__delayed_focus_set", entry); + efl_event_callback_add(entry, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, user); + return; + } } while (m); } --
