summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 11:29:18 -0400
committerMike Blumenkrantz <zmike@samsung.com>2020-04-14 11:29:18 -0400
commit2ed854bb925b3da5209a55f5c3b4440db0dbbff6 (patch)
treef9fd0f53e49f66a887e0941313d63ed38ef20d34 /src/lib/elementary
parent6031466142a3d1e85b234267bfd664df727ce8b9 (diff)
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
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c4
1 files 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)
788} 788}
789 789
790EOLIAN static void 790EOLIAN static void
791_efl_ui_focus_manager_calc_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *child) 791_efl_ui_focus_manager_calc_unregister(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *child)
792{ 792{
793 Node *node; 793 Node *node;
794 794
@@ -800,7 +800,7 @@ _efl_ui_focus_manager_calc_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_
800 800
801 if (eina_list_last_data_get(pd->focus_stack) == node) 801 if (eina_list_last_data_get(pd->focus_stack) == node)
802 { 802 {
803 if (!efl_invalidated_get(pd->root->focusable)) 803 if (!efl_invalidated_get(pd->root->focusable) && _focus_manager_active_get(obj))
804 { 804 {
805 Node *n = NULL; 805 Node *n = NULL;
806 806