summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 12:29:57 -0400
committerMike Blumenkrantz <zmike@samsung.com>2020-04-14 12:29:57 -0400
commitf092d3f5abee75283e86d6d8ac6d20669862f908 (patch)
tree3d546a3d86e3b1efffeaf526276976f0e1171c2e /src/lib/elementary
parentbb2327017fb79f88c3cb52da24f82e664c64377e (diff)
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
Diffstat (limited to 'src/lib/elementary')
-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 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)
111{ 111{
112 Eo *root, *manager, *comp_parent, *redirect; 112 Eo *root, *manager, *comp_parent, *redirect;
113 113
114 if (efl_isa(obj, EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE) || 114 root = efl_ui_focus_manager_root_get(obj);
115 (efl_composite_part_is(obj) && efl_isa(efl_parent_get(obj), EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE))) 115
116 if (efl_isa(root, EFL_UI_FOCUS_MANAGER_WINDOW_ROOT_INTERFACE))
116 return EINA_TRUE; 117 return EINA_TRUE;
117 118
118 root = efl_ui_focus_manager_root_get(obj);
119 manager = efl_ui_focus_object_focus_manager_get(root); 119 manager = efl_ui_focus_object_focus_manager_get(root);
120 120
121 if (!manager) return EINA_FALSE; 121 if (!manager) return EINA_FALSE;