[EGIT] [core/efl] master 03/04: efl_ui_focus_util: support later managers not beeing registered

[Marcel Hollerbach]

bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=33921385f9eb2f9062d9a28c030d1e0ff418658c

commit 33921385f9eb2f9062d9a28c030d1e0ff418658c
Author: Marcel Hollerbach <mar...@osg.samsung.com>
Date:   Sat Apr 7 23:59:47 2018 +0200

    efl_ui_focus_util: support later managers not beeing registered
    
    this should fix some corner cases when setting focus by hand
---
 src/lib/elementary/efl_ui_focus_util.c | 36 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/lib/elementary/efl_ui_focus_util.c 
b/src/lib/elementary/efl_ui_focus_util.c
index 8758047eda..a8549e4da0 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -18,9 +18,9 @@ _manager_changed(void *data, const Efl_Event *event 
EINA_UNUSED)
 EOLIAN static void
 _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, 
Efl_Ui_Focus_Object *user)
 {
+   Efl_Ui_Focus_Object *entry;
    Efl_Ui_Widget *top, *o;
-   Efl_Ui_Focus_Manager *m;
-   m = efl_ui_focus_object_focus_manager_get(user);
+   Efl_Ui_Focus_Manager *m, *registered_manager;
 
    top = elm_widget_top_get(user);
 
@@ -28,15 +28,29 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd 
EINA_UNUSED, Efl_Ui_Focus
    if (o) efl_event_callback_del(o, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, 
_manager_changed, o);
    efl_key_data_set(top, "__delayed_focus_set", NULL);
 
-   if (!m)
-     {
-        //delayed focusung
-        efl_key_data_set(top, "__delayed_focus_set", user);
-        efl_event_callback_add(user, 
EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, user);
-        return;
-     }
-
-   efl_ui_focus_manager_focus_set(m, user);
+   registered_manager = m = efl_ui_focus_object_focus_manager_get(user);
+   entry = user;
+
+   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);
+     if (efl_isa(m, EFL_UI_WIN_CLASS))
+       {
+          //we are at the root of the window, we can set the focus to the 
object
+          efl_ui_focus_manager_focus_set(registered_manager, user);
+          return;
+       }
+
+     //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);
 }
 
 #include "efl_ui_focus_util.eo.c"

--