zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f092d3f5abee75283e86d6d8ac6d20669862f908
commit f092d3f5abee75283e86d6d8ac6d20669862f908 Author: Marcel Hollerbach <[email protected]> Date: Tue Apr 14 12:29:57 2020 -0400 efl_ui_focus_manager: correct check Summary: this check was checking for focus_manager to be window_root. This is not correct, it should check for the root element. ref D11667 Depends on D11705 Reviewers: zmike, segfaultxavi Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11706 --- src/lib/elementary/efl_ui_focus_manager_calc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 33f69398c0..305b5092c5 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -111,11 +111,11 @@ _focus_manager_active_get(Eo *obj) { Eo *root, *manager, *comp_parent, *redirect; - if (efl_isa(obj, EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE) || - (efl_composite_part_is(obj) && efl_isa(efl_parent_get(obj), EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE))) + root = efl_ui_focus_manager_root_get(obj); + + if (efl_isa(root, EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE)) return EINA_TRUE; - root = efl_ui_focus_manager_root_get(obj); manager = efl_ui_focus_object_focus_manager_get(root); if (!manager) return EINA_FALSE; --
