NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_ui_focus_manager_calc: restore focus correctly if redirect gets NULL 

Otherwise we might end up with focus beeing NULL.

Differential Revision: https://phab.enlightenment.org/D6803
This commit is contained in:
Marcel Hollerbach 2018-08-09 10:52:55 +02:00
parent f21cf89a2f
commit 37308192d9
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/elementary/efl_ui_focus_manager_calc.c
View File

@ -800,11 +800,22 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_redirect_set(Eo *obj, Efl_Ui_Foc
n = eina_list_last_data_get(pd->focus_stack);
if (n)
if (!pd->redirect && old_manager)
{
if (!pd->redirect && old_manager)
efl_ui_focus_object_focus_set(n->focusable, EINA_TRUE);
else if (pd->redirect && !old_manager)
if (n)
{
efl_ui_focus_object_focus_set(n->focusable, EINA_TRUE);
}
else
{
n = _request_subchild(pd->root);
if (n)
efl_ui_focus_manager_focus_set(obj, n->focusable);
}
}
else if (pd->redirect && !old_manager)
{
if (n)
efl_ui_focus_object_focus_set(n->focusable, EINA_FALSE);
}
}