1 files changed, 53 insertions, 13 deletions

diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index efb3219fd1..aa342a92f4 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -16,27 +16,67 @@ _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_User *user)
+_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Object *user)
 {
-   Elm_Widget *top, *o;
-   Efl_Ui_Focus_Manager *m;
-   m = efl_ui_focus_user_focus_manager_get(user);
+   Efl_Ui_Focus_Object *entry;
+   Efl_Ui_Widget *top, *o;
+   Efl_Ui_Focus_Manager *m, *registered_manager;
 
    top = elm_widget_top_get(user);
 
    o = efl_key_data_get(top, "__delayed_focus_set");
-   efl_event_callback_del(o, EFL_UI_FOCUS_USER_EVENT_MANAGER_CHANGED, _manager_changed, o);
+   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_USER_EVENT_MANAGER_CHANGED, _manager_changed, user);
-        return;
-     }
+   registered_manager = m = efl_ui_focus_object_focus_manager_get(user);
+   entry = user;
 
-   efl_ui_focus_manager_focus_set(m, 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);
+}
+
+EOLIAN static Efl_Ui_Focus_Manager*
+_efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Manager *manager)
+{
+   while (efl_ui_focus_manager_redirect_get(manager))
+     manager = efl_ui_focus_manager_redirect_get(manager);
+
+   return manager;
+}
+
+EOLIAN static Efl_Ui_Focus_Direction
+_efl_ui_focus_util_direction_complement(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Direction dir)
+{
+  #define COMP(a,b) \
+        if (dir == a) return b; \
+        if (dir == b) return a;
+
+    COMP(EFL_UI_FOCUS_DIRECTION_RIGHT, EFL_UI_FOCUS_DIRECTION_LEFT)
+    COMP(EFL_UI_FOCUS_DIRECTION_UP, EFL_UI_FOCUS_DIRECTION_DOWN)
+    COMP(EFL_UI_FOCUS_DIRECTION_PREVIOUS, EFL_UI_FOCUS_DIRECTION_NEXT)
+
+    #undef COMP
+
+    return EFL_UI_FOCUS_DIRECTION_LAST;
 }
 
+
 #include "efl_ui_focus_util.eo.c"