From 229dc576e637b7c78b2cf87933d2442a51b46aba Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 21 Feb 2019 21:35:34 +0100 Subject: [PATCH] efl_ui_focus_object: rename events the event now math the pattern of ,changed. ref T7571 Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D7989 --- src/lib/elementary/efl_ui_focus_layer.c | 4 ++-- src/lib/elementary/efl_ui_focus_manager_sub.c | 4 ++-- src/lib/elementary/efl_ui_focus_object.eo | 4 ++-- src/lib/elementary/efl_ui_focus_util.c | 4 ++-- src/lib/elementary/efl_ui_tags.c | 2 +- src/lib/elementary/efl_ui_widget.c | 10 +++++----- src/lib/elementary/elm_focus_legacy.c | 6 +++--- src/tests/elementary/efl_ui_test_focus_sub.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index 9cab1327b8..6c6c8218c1 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -97,8 +97,8 @@ _efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd) static void _publish_state_change(Eo *obj, Efl_Ui_Focus_Manager *omanager, Efl_Ui_Focus_Object *oobj) { - efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, omanager); - efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, oobj); + efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, omanager); + efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, oobj); } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.c b/src/lib/elementary/efl_ui_focus_manager_sub.c index eb05f971b0..96eebdde50 100644 --- a/src/lib/elementary/efl_ui_focus_manager_sub.c +++ b/src/lib/elementary/efl_ui_focus_manager_sub.c @@ -203,8 +203,8 @@ _manager_change(void *data, const Efl_Event *ev EINA_UNUSED) EFL_CALLBACKS_ARRAY_DEFINE(self_manager, {EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, _self_manager_dirty}, - {EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, _logical_manager_change}, - {EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_change} + {EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, _logical_manager_change}, + {EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_change} ); EOLIAN static Efl_Object* diff --git a/src/lib/elementary/efl_ui_focus_object.eo b/src/lib/elementary/efl_ui_focus_object.eo index a0589228d6..6e84f32ac9 100644 --- a/src/lib/elementary/efl_ui_focus_object.eo +++ b/src/lib/elementary/efl_ui_focus_object.eo @@ -76,9 +76,9 @@ mixin @beta Efl.Ui.Focus.Object } events { focus,changed : bool; [[Emitted if the focus state has changed]] - manager,changed: Efl.Ui.Focus.Manager; [[Emitted when a new manager is + focus_manager,changed: Efl.Ui.Focus.Manager; [[Emitted when a new manager is the parent for this object.]] - logical,changed: Efl.Ui.Focus.Object; [[Emitted when a new logical + focus_parent,changed: Efl.Ui.Focus.Object; [[Emitted when a new logical parent should be used.]] child_focus,changed: bool; [[Emitted if child_focus has changed]] focus_geometry,changed: void; [[Emitted if focus geometry of this object has changed]] diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c index 3021c683eb..891489773e 100644 --- a/src/lib/elementary/efl_ui_focus_util.c +++ b/src/lib/elementary/efl_ui_focus_util.c @@ -34,7 +34,7 @@ _efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user) top = elm_widget_top_get(user); o = efl_key_data_get(top, "__delayed_focus_set"); - if (o) efl_event_callback_del(o, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, o); + if (o) efl_event_callback_del(o, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, o); efl_key_data_set(top, "__delayed_focus_set", NULL); registered_manager = m = efl_ui_focus_object_focus_manager_get(user); @@ -54,7 +54,7 @@ _efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user) { efl_key_data_set(top, "__delayed_focus_set", entry); efl_event_callback_add(entry, - EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, + EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, user); } else if (efl_isa(m, EFL_UI_WIN_CLASS)) diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c index 97e613014d..acf61535f1 100644 --- a/src/lib/elementary/efl_ui_tags.c +++ b/src/lib/elementary/efl_ui_tags.c @@ -1029,7 +1029,7 @@ _efl_ui_tags_efl_object_constructor(Eo *obj, Efl_Ui_Tags_Data *sd) _callbacks_register(obj); //listen to manager changes here - efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL); + efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL); return obj; } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index c72ea15531..9123831f93 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -402,13 +402,13 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd) old = pd->manager.manager; if (pd->manager.provider) - efl_event_callback_del(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); + efl_event_callback_del(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj); pd->manager.manager = new; pd->manager.provider = provider; if (pd->manager.provider) - efl_event_callback_add(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); + efl_event_callback_add(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj); } return old; @@ -619,13 +619,13 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd) if (old_registered_parent != pd->focus.parent) { efl_event_callback_call(obj, - EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, old_registered_parent); + EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, old_registered_parent); } if (old_registered_manager != pd->focus.manager) { efl_event_callback_call(obj, - EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, old_registered_manager); + EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, old_registered_manager); } } @@ -5364,7 +5364,7 @@ _efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) { if (sd->manager.provider) { - efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); + efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj); sd->manager.provider = NULL; } efl_access_object_attributes_clear(obj); diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c index d77274fb6c..df9c90b3c0 100644 --- a/src/lib/elementary/elm_focus_legacy.c +++ b/src/lib/elementary/elm_focus_legacy.c @@ -86,12 +86,12 @@ _custom_chain_set(Efl_Ui_Widget *node, Eina_List *lst) if (pd->legacy_focus.custom_chain && !pd->legacy_focus.listen_to_manager) { - efl_event_callback_add(node, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, NULL); + efl_event_callback_add(node, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, NULL); pd->legacy_focus.listen_to_manager = EINA_TRUE; } else if (!pd->legacy_focus.custom_chain && pd->legacy_focus.listen_to_manager) { - efl_event_callback_del(node, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, NULL); + efl_event_callback_del(node, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, NULL); pd->legacy_focus.listen_to_manager = EINA_FALSE; } @@ -455,7 +455,7 @@ legacy_child_focus_handle(Efl_Ui_Focus_Object *object) Legacy_Object_Focus_State *state = calloc(1, sizeof(Legacy_Object_Focus_State)); state->emittee = object; - efl_event_callback_add(object, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_focus_object_changed, state); + efl_event_callback_add(object, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_focus_object_changed, state); efl_event_callback_add(object, EFL_EVENT_DEL, _focus_manager_del, state); } diff --git a/src/tests/elementary/efl_ui_test_focus_sub.c b/src/tests/elementary/efl_ui_test_focus_sub.c index 415e096ea1..b026307e3a 100644 --- a/src/tests/elementary/efl_ui_test_focus_sub.c +++ b/src/tests/elementary/efl_ui_test_focus_sub.c @@ -107,7 +107,7 @@ _setup(Efl_Ui_Focus_Manager **m, Efl_Ui_Focus_Manager_Sub **sub, Efl_Ui_Focus_Ob efl_composite_attach(focus_main, subm); - efl_event_callback_call(focus_main, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, NULL); + efl_event_callback_call(focus_main, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, NULL); efl_ui_focus_manager_calc_register_logical(manager, focus_main, root_manager, subm);