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

efl_ui_focus_manager_root_focus: restructure state eval 

registering and unregsitering caused a few issues.
- Relations are recalculated even if they should not be
- We unfocus a element just to refocus it again
- We loose any iinformation about custom chains that have been set meanwhile

This fixes it
This commit is contained in:
Marcel Hollerbach 2018-05-09 21:48:12 +02:00
parent 05d4f0b256
commit 8e104d5bfe
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/elementary/efl_ui_focus_manager_root_focus.c
View File

@ -31,35 +31,35 @@ _trap(Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *obj)
static void static void
_state_eval(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd) _state_eval(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd)
{ {
Efl_Ui_Focus_Object *root; Efl_Ui_Focus_Object *sub;
Eina_Bool none_logical = EINA_FALSE, focused = EINA_FALSE;
if (pd->rect_registered) sub = efl_ui_focus_manager_request_subchild(obj, efl_ui_focus_manager_root_get(obj));
if (sub == pd->rect)
{ {
focused = efl_ui_focus_object_focus_get(pd->rect); sub = efl_ui_focus_manager_request_move(obj, EFL_UI_FOCUS_DIRECTION_NEXT, pd->rect, EINA_FALSE);
efl_ui_focus_manager_calc_unregister(obj, pd->rect); if (sub == pd->rect)
sub = NULL;
} }
root = efl_ui_focus_manager_root_get(obj); EINA_SAFETY_ON_TRUE_RETURN(sub == pd->rect);
none_logical = !!efl_ui_focus_manager_request_subchild(obj, root);
if (none_logical) if (sub && pd->rect_registered)
{ {
efl_ui_focus_manager_calc_unregister(obj, pd->rect);
pd->rect_registered = EINA_FALSE; pd->rect_registered = EINA_FALSE;
efl_ui_focus_composition_adapter_focus_manager_parent_set(pd->rect, NULL); efl_ui_focus_composition_adapter_focus_manager_parent_set(pd->rect, NULL);
efl_ui_focus_composition_adapter_focus_manager_object_set(pd->rect, NULL); efl_ui_focus_composition_adapter_focus_manager_object_set(pd->rect, NULL);
} }
else else if (!sub && !pd->rect_registered)
{ {
efl_ui_focus_manager_calc_register(obj, pd->rect, pd->replacement_object, NULL); Efl_Ui_Focus_Object *root;
pd->rect_registered = EINA_TRUE;
efl_ui_focus_composition_adapter_focus_manager_parent_set(pd->rect, pd->replacement_object); root = efl_ui_focus_manager_root_get(obj);
efl_ui_focus_manager_calc_register(obj, pd->rect, root, NULL);
efl_ui_focus_composition_adapter_focus_manager_parent_set(pd->rect, root);
efl_ui_focus_composition_adapter_focus_manager_object_set(pd->rect, obj); efl_ui_focus_composition_adapter_focus_manager_object_set(pd->rect, obj);
pd->rect_registered = EINA_TRUE;
if (focused)
efl_ui_focus_manager_focus_set(obj, pd->rect);
} }
} }