summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-08 22:44:48 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-09 10:15:55 +0200
commitca6ce538b59104e86b882cc94d382b9d91059742 (patch)
treebff8e43dd67ed97ccb8182727113747e8539cc34
parentb0fd22fffe22487e7ac5919ed60f3eed83c9c7c3 (diff)
downloadefl-ca6ce538b59104e86b882cc94d382b9d91059742.tar.gz
efl_ui_focus_manager: correct check
this check was checking for focus_manager to be window_root. This is not correct, it should check for the root element. ref D11667
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c6
1 files 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 9c104ab7a9..3be8744c64 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;