From 6031466142a3d1e85b234267bfd664df727ce8b9 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 14 Apr 2020 11:29:12 -0400 Subject: [PATCH] efl_ui_focus_manager: do not fallback to the same object Summary: when redirect gets unset, we shound search for a fallback. However, we should never fallback to the value we have unset. ref D11667 Depends on D11669 Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11670 --- src/lib/elementary/efl_ui_focus_manager_calc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index b2342c6a13..3d214c0fe5 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -869,7 +869,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_redirect_set(Eo *obj, Efl_Ui_Foc } else { - n = _request_subchild(pd->root); + n = _request_subchild_except(pd->root, pd->redirect_entry); if (n) efl_ui_focus_manager_focus_set(obj, n->focusable); }