zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2ed854bb925b3da5209a55f5c3b4440db0dbbff6
commit 2ed854bb925b3da5209a55f5c3b4440db0dbbff6 Author: Marcel Hollerbach <[email protected]> Date: Tue Apr 14 11:29:18 2020 -0400 efl_ui_focus_manager: do not magically set focus to new elements Summary: otherwise this focus manager might get activated again. ref D11667 Depends on D11670 Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11671 --- src/lib/elementary/efl_ui_focus_manager_calc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 3d214c0fe5..33f69398c0 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -788,7 +788,7 @@ _request_subchild_except(Node *n, Eo *except) } EOLIAN static void -_efl_ui_focus_manager_calc_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *child) +_efl_ui_focus_manager_calc_unregister(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *child) { Node *node; @@ -800,7 +800,7 @@ _efl_ui_focus_manager_calc_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_ if (eina_list_last_data_get(pd->focus_stack) == node) { - if (!efl_invalidated_get(pd->root->focusable)) + if (!efl_invalidated_get(pd->root->focusable) && _focus_manager_active_get(obj)) { Node *n = NULL; --
