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

efl_ui_focus_object: rename events 

the event now math the pattern of <property-name>,changed.

ref T7571

Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D7989
This commit is contained in:
Marcel Hollerbach 2019-02-21 21:35:34 +01:00
parent b9f82ccac3
commit 229dc576e6
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/elementary/efl_ui_focus_layer.c
View File

@ -97,8 +97,8 @@ _efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd)
static void static void
_publish_state_change(Eo *obj, Efl_Ui_Focus_Manager *omanager, Efl_Ui_Focus_Object *oobj) _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_FOCUS_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_PARENT_CHANGED, oobj);
} }
EOLIAN static void EOLIAN static void

4
src/lib/elementary/efl_ui_focus_manager_sub.c
View File

@ -203,8 +203,8 @@ _manager_change(void *data, const Efl_Event *ev EINA_UNUSED)
EFL_CALLBACKS_ARRAY_DEFINE(self_manager, EFL_CALLBACKS_ARRAY_DEFINE(self_manager,
{EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, _self_manager_dirty}, {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_FOCUS_PARENT_CHANGED, _logical_manager_change},
{EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_change} {EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_change}
); );
EOLIAN static Efl_Object* EOLIAN static Efl_Object*

4
src/lib/elementary/efl_ui_focus_object.eo
View File

@ -76,9 +76,9 @@ mixin @beta Efl.Ui.Focus.Object
} }
events { events {
focus,changed : bool; [[Emitted if the focus state has changed]] 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.]] 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.]] parent should be used.]]
child_focus,changed: bool; [[Emitted if child_focus has changed]] child_focus,changed: bool; [[Emitted if child_focus has changed]]
focus_geometry,changed: void; [[Emitted if focus geometry of this object has changed]] focus_geometry,changed: void; [[Emitted if focus geometry of this object has changed]]

4
src/lib/elementary/efl_ui_focus_util.c
View File

@ -34,7 +34,7 @@ _efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
top = elm_widget_top_get(user); top = elm_widget_top_get(user);
o = efl_key_data_get(top, "__delayed_focus_set"); 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); efl_key_data_set(top, "__delayed_focus_set", NULL);
registered_manager = m = efl_ui_focus_object_focus_manager_get(user); 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_key_data_set(top, "__delayed_focus_set", entry);
efl_event_callback_add(entry, efl_event_callback_add(entry,
EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED,
_manager_changed, user); _manager_changed, user);
} }
else if (efl_isa(m, EFL_UI_WIN_CLASS)) else if (efl_isa(m, EFL_UI_WIN_CLASS))

2
src/lib/elementary/efl_ui_tags.c
View File

@ -1029,7 +1029,7 @@ _efl_ui_tags_efl_object_constructor(Eo *obj, Efl_Ui_Tags_Data *sd)
_callbacks_register(obj); _callbacks_register(obj);
//listen to manager changes here //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; return obj;
} }

10
src/lib/elementary/efl_ui_widget.c
View File

@ -402,13 +402,13 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
old = pd->manager.manager; old = pd->manager.manager;
if (pd->manager.provider) 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.manager = new;
pd->manager.provider = provider; pd->manager.provider = provider;
if (pd->manager.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; return old;
@ -619,13 +619,13 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
if (old_registered_parent != pd->focus.parent) if (old_registered_parent != pd->focus.parent)
{ {
efl_event_callback_call(obj, 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) if (old_registered_manager != pd->focus.manager)
{ {
efl_event_callback_call(obj, 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) 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; sd->manager.provider = NULL;
} }
efl_access_object_attributes_clear(obj); efl_access_object_attributes_clear(obj);

6
src/lib/elementary/elm_focus_legacy.c
View File

@ -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) 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; pd->legacy_focus.listen_to_manager = EINA_TRUE;
} }
else if (!pd->legacy_focus.custom_chain && pd->legacy_focus.listen_to_manager) 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; 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)); Legacy_Object_Focus_State *state = calloc(1, sizeof(Legacy_Object_Focus_State));
state->emittee = object; 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); efl_event_callback_add(object, EFL_EVENT_DEL, _focus_manager_del, state);
} }

2
src/tests/elementary/efl_ui_test_focus_sub.c
View File

@ -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_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); efl_ui_focus_manager_calc_register_logical(manager, focus_main, root_manager, subm);