From 54145f488bd7a62318d8dd1b2fca50632791ba58 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 12 Dec 2016 21:01:18 +0100 Subject: [PATCH] efl_ui_focus_manager: unset redirect when focusing new item --- src/lib/elementary/efl_ui_focus_manager.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_focus_manager.c b/src/lib/elementary/efl_ui_focus_manager.c index 7d2019d062..c0aadc94e0 100644 --- a/src/lib/elementary/efl_ui_focus_manager.c +++ b/src/lib/elementary/efl_ui_focus_manager.c @@ -1058,6 +1058,12 @@ _efl_ui_focus_manager_focus(Eo *obj, Efl_Ui_Focus_Manager_Data *pd, Efl_Ui_Focus return; } + if (pd->redirect) + { + //first unset the redirect + efl_ui_focus_manager_redirect_set(obj, NULL); + } + //check if this is already the focused object old_focus = eina_list_last_data_get(pd->focus_stack); @@ -1111,7 +1117,6 @@ _efl_ui_focus_manager_move(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Data *pd, E if (new_candidate) { //redirect does not have smth. but we do have. - efl_ui_focus_manager_redirect_set(obj, NULL); efl_ui_focus_manager_focus(obj, new_candidate); } }