From: Marcel Hollerbach Date: Tue, 21 Nov 2017 15:14:18 +0000 (+0100) Subject: efl_ui_focus_layer: rely on _manager_in_chain_set X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~1586 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a58cc75e55cb18d9ab4c36310a23d2d90d9a9cd0;p=platform%2Fupstream%2Fefl.git efl_ui_focus_layer: rely on _manager_in_chain_set so we dont have to set the direct by hand anymore --- diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index eee2405..f46b735 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -88,13 +88,15 @@ _efl_ui_focus_layer_enable_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v { pd->registered_manager = elm_widget_top_get(obj); - efl_ui_focus_manager_redirect_set(pd->registered_manager, obj); + efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj); efl_ui_focus_manager_focus_set(pd->manager, obj); } else { if (efl_ui_focus_manager_redirect_get(pd->registered_manager) == obj) efl_ui_focus_manager_redirect_set(pd->registered_manager, NULL); + + efl_ui_focus_manager_calc_unregister(pd->registered_manager, obj); pd->registered_manager = NULL; } }