summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-21 21:35:34 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-22 14:00:32 +0100
commit229dc576e637b7c78b2cf87933d2442a51b46aba (patch)
tree751a0fa9ab99c4051d16efe8fe276f7c3929338b /src
parentb9f82ccac30a1fdd7d5864b1b700bdfc839bce1f (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_sub.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_object.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c4
-rw-r--r--src/lib/elementary/efl_ui_tags.c2
-rw-r--r--src/lib/elementary/efl_ui_widget.c10
-rw-r--r--src/lib/elementary/elm_focus_legacy.c6
-rw-r--r--src/tests/elementary/efl_ui_test_focus_sub.c2
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)
97static void 97static void
98_publish_state_change(Eo *obj, Efl_Ui_Focus_Manager *omanager, Efl_Ui_Focus_Object *oobj) 98_publish_state_change(Eo *obj, Efl_Ui_Focus_Manager *omanager, Efl_Ui_Focus_Object *oobj)
99{ 99{
100 efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, omanager); 100 efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, omanager);
101 efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, oobj); 101 efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, oobj);
102} 102}
103 103
104EOLIAN static void 104EOLIAN 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)
203 203
204EFL_CALLBACKS_ARRAY_DEFINE(self_manager, 204EFL_CALLBACKS_ARRAY_DEFINE(self_manager,
205 {EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, _self_manager_dirty}, 205 {EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, _self_manager_dirty},
206 {EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, _logical_manager_change}, 206 {EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, _logical_manager_change},
207 {EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_change} 207 {EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_change}
208); 208);
209 209
210EOLIAN static Efl_Object* 210EOLIAN 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
76 } 76 }
77 events { 77 events {
78 focus,changed : bool; [[Emitted if the focus state has changed]] 78 focus,changed : bool; [[Emitted if the focus state has changed]]
79 manager,changed: Efl.Ui.Focus.Manager; [[Emitted when a new manager is 79 focus_manager,changed: Efl.Ui.Focus.Manager; [[Emitted when a new manager is
80 the parent for this object.]] 80 the parent for this object.]]
81 logical,changed: Efl.Ui.Focus.Object; [[Emitted when a new logical 81 focus_parent,changed: Efl.Ui.Focus.Object; [[Emitted when a new logical
82 parent should be used.]] 82 parent should be used.]]
83 child_focus,changed: bool; [[Emitted if child_focus has changed]] 83 child_focus,changed: bool; [[Emitted if child_focus has changed]]
84 focus_geometry,changed: void; [[Emitted if focus geometry of this object has changed]] 84 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)
34 top = elm_widget_top_get(user); 34 top = elm_widget_top_get(user);
35 35
36 o = efl_key_data_get(top, "__delayed_focus_set"); 36 o = efl_key_data_get(top, "__delayed_focus_set");
37 if (o) efl_event_callback_del(o, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, o); 37 if (o) efl_event_callback_del(o, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, o);
38 efl_key_data_set(top, "__delayed_focus_set", NULL); 38 efl_key_data_set(top, "__delayed_focus_set", NULL);
39 39
40 registered_manager = m = efl_ui_focus_object_focus_manager_get(user); 40 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)
54 { 54 {
55 efl_key_data_set(top, "__delayed_focus_set", entry); 55 efl_key_data_set(top, "__delayed_focus_set", entry);
56 efl_event_callback_add(entry, 56 efl_event_callback_add(entry,
57 EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, 57 EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED,
58 _manager_changed, user); 58 _manager_changed, user);
59 } 59 }
60 else if (efl_isa(m, EFL_UI_WIN_CLASS)) 60 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)
1029 _callbacks_register(obj); 1029 _callbacks_register(obj);
1030 1030
1031 //listen to manager changes here 1031 //listen to manager changes here
1032 efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL); 1032 efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL);
1033 1033
1034 return obj; 1034 return obj;
1035} 1035}
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)
402 old = pd->manager.manager; 402 old = pd->manager.manager;
403 403
404 if (pd->manager.provider) 404 if (pd->manager.provider)
405 efl_event_callback_del(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); 405 efl_event_callback_del(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj);
406 406
407 pd->manager.manager = new; 407 pd->manager.manager = new;
408 pd->manager.provider = provider; 408 pd->manager.provider = provider;
409 409
410 if (pd->manager.provider) 410 if (pd->manager.provider)
411 efl_event_callback_add(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); 411 efl_event_callback_add(pd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj);
412 } 412 }
413 413
414 return old; 414 return old;
@@ -619,13 +619,13 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
619 if (old_registered_parent != pd->focus.parent) 619 if (old_registered_parent != pd->focus.parent)
620 { 620 {
621 efl_event_callback_call(obj, 621 efl_event_callback_call(obj,
622 EFL_UI_FOCUS_OBJECT_EVENT_LOGICAL_CHANGED, old_registered_parent); 622 EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_PARENT_CHANGED, old_registered_parent);
623 } 623 }
624 624
625 if (old_registered_manager != pd->focus.manager) 625 if (old_registered_manager != pd->focus.manager)
626 { 626 {
627 efl_event_callback_call(obj, 627 efl_event_callback_call(obj,
628 EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, old_registered_manager); 628 EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, old_registered_manager);
629 } 629 }
630 630
631} 631}
@@ -5364,7 +5364,7 @@ _efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5364{ 5364{
5365 if (sd->manager.provider) 5365 if (sd->manager.provider)
5366 { 5366 {
5367 efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); 5367 efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed_cb, obj);
5368 sd->manager.provider = NULL; 5368 sd->manager.provider = NULL;
5369 } 5369 }
5370 efl_access_object_attributes_clear(obj); 5370 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)
86 86
87 if (pd->legacy_focus.custom_chain && !pd->legacy_focus.listen_to_manager) 87 if (pd->legacy_focus.custom_chain && !pd->legacy_focus.listen_to_manager)
88 { 88 {
89 efl_event_callback_add(node, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, NULL); 89 efl_event_callback_add(node, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, NULL);
90 pd->legacy_focus.listen_to_manager = EINA_TRUE; 90 pd->legacy_focus.listen_to_manager = EINA_TRUE;
91 } 91 }
92 else if (!pd->legacy_focus.custom_chain && pd->legacy_focus.listen_to_manager) 92 else if (!pd->legacy_focus.custom_chain && pd->legacy_focus.listen_to_manager)
93 { 93 {
94 efl_event_callback_del(node, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed, NULL); 94 efl_event_callback_del(node, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_changed, NULL);
95 pd->legacy_focus.listen_to_manager = EINA_FALSE; 95 pd->legacy_focus.listen_to_manager = EINA_FALSE;
96 } 96 }
97 97
@@ -455,7 +455,7 @@ legacy_child_focus_handle(Efl_Ui_Focus_Object *object)
455 Legacy_Object_Focus_State *state = calloc(1, sizeof(Legacy_Object_Focus_State)); 455 Legacy_Object_Focus_State *state = calloc(1, sizeof(Legacy_Object_Focus_State));
456 state->emittee = object; 456 state->emittee = object;
457 457
458 efl_event_callback_add(object, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_focus_object_changed, state); 458 efl_event_callback_add(object, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, _manager_focus_object_changed, state);
459 efl_event_callback_add(object, EFL_EVENT_DEL, _focus_manager_del, state); 459 efl_event_callback_add(object, EFL_EVENT_DEL, _focus_manager_del, state);
460} 460}
461 461
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
107 107
108 efl_composite_attach(focus_main, subm); 108 efl_composite_attach(focus_main, subm);
109 109
110 efl_event_callback_call(focus_main, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, NULL); 110 efl_event_callback_call(focus_main, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_MANAGER_CHANGED, NULL);
111 111
112 efl_ui_focus_manager_calc_register_logical(manager, focus_main, root_manager, subm); 112 efl_ui_focus_manager_calc_register_logical(manager, focus_main, root_manager, subm);
113 113