enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_ui_focus_manager: do not adjust values on a inactive manager 

The bug this fixes can be observed when opening elm_test with hoversel.

The problem here is that the focus manager gets operations called on it after it is not active anymore, which lead to the fact that focus was restored on something that was about to be deleted.
Differential Revision: https://phab.enlightenment.org/D6903
This commit is contained in:
Marcel Hollerbach 2018-08-24 13:49:07 +00:00 committed by Marcel Hollerbach
parent 40d03dbef8
commit bae53f7d72
1 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,34 @@ static void dirty_add(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Node *dirty);
static Node* _next(Node *node);
static void _prepare_node(Node *root);
static Eina_Bool
_focus_manager_active_get(Eo *obj)
{
Eo *root, *manager, *comp_parent, *redirect;
if (efl_isa(obj, 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;
redirect = efl_ui_focus_manager_redirect_get(manager);
if (!redirect) return EINA_FALSE;
if (efl_composite_part_is(obj))
comp_parent = efl_parent_get(obj); //a focus manager can be attached to something via composition
else
comp_parent = NULL;
if (redirect == obj ||
(redirect == comp_parent))
return EINA_TRUE;
return EINA_FALSE;
}
static void
_manager_in_chain_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd)
{
@ -795,30 +823,31 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_redirect_set(Eo *obj, Efl_Ui_Foc
efl_ui_focus_manager_reset_history(old_manager);
//adjust focus property of the most upper element
{
Node *n = NULL;
if (_focus_manager_active_get(obj))
{
Node *n = NULL;
n = eina_list_last_data_get(pd->focus_stack);
n = eina_list_last_data_get(pd->focus_stack);
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);
}
}
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);
}
}
efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED , old_manager);