summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-17 17:21:58 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-22 14:00:28 +0100
commit93903a7ba3c444be4255724dd02488a8c83a01a4 (patch)
treed4f3be715eddf4083d75094aa774e108761f3a39 /src
parentf734f52cd9916bcf1275c1e19b00d73eb6c064a1 (diff)
efl_ui_focus_manager: rename focus,changed
focus,changed is already used in efl_ui_focus_object, which makes sense there. However, here we listen for the property focus_manager, thus its renamed to focus_manager,changed. ref T7571 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D7990
Diffstat (limited to 'src')
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_3.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.eo2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c6
-rw-r--r--src/lib/elementary/efl_ui_list_view.c4
-rw-r--r--src/lib/elementary/efl_ui_tags.c4
-rw-r--r--src/lib/elementary/elm_focus_legacy.c6
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_scroller.c2
-rw-r--r--src/tests/elementary/efl_ui_test_focus_sub.c2
11 files changed, 18 insertions, 18 deletions
diff --git a/src/examples/elementary/efl_ui_list_view_example_3.c b/src/examples/elementary/efl_ui_list_view_example_3.c
index 47718a83d4..5c2b3a8217 100644
--- a/src/examples/elementary/efl_ui_list_view_example_3.c
+++ b/src/examples/elementary/efl_ui_list_view_example_3.c
@@ -313,7 +313,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
313 elm_box_pack_end(vbx, bt); 313 elm_box_pack_end(vbx, bt);
314 314
315 elm_box_pack_end(bx, priv->list2); 315 elm_box_pack_end(bx, priv->list2);
316 efl_event_callback_add(priv->list2, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _focused ,priv); 316 efl_event_callback_add(priv->list2, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _focused ,priv);
317 317
318 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv); 318 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, priv);
319 319
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index 2d777bfa02..b87f99fa49 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -192,7 +192,7 @@ interface @beta Efl.Ui.Focus.Manager {
192 flush,pre: void; [[Emitted once the graph calculationg will be performed]] 192 flush,pre: void; [[Emitted once the graph calculationg will be performed]]
193 coords,dirty: void; [[Emitted once the graph is dirty, this means there are 193 coords,dirty: void; [[Emitted once the graph is dirty, this means there are
194 potential changes in border_elements you want to know about]] 194 potential changes in border_elements you want to know about]]
195 focus,changed : Efl.Ui.Focus.Object; [[Emitted if the manager has focused an 195 manager_focus,changed : Efl.Ui.Focus.Object; [[Emitted if the manager has focused an
196 object, the passed focus object is the last focused object]] 196 object, the passed focus object is the last focused object]]
197 dirty_logic_freeze,changed : bool; [[Called when this focus manager is frozen or unfrozen, even_info beeing $true indicates that it is now frozen, $false indicates that it is unfrozen.]] 197 dirty_logic_freeze,changed : bool; [[Called when this focus manager is frozen or unfrozen, even_info beeing $true indicates that it is now frozen, $false indicates that it is unfrozen.]]
198 } 198 }
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 308cdd861e..5395906470 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -1553,7 +1553,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_U
1553 efl_ui_focus_object_focus_set(last_focusable, EINA_FALSE); 1553 efl_ui_focus_object_focus_set(last_focusable, EINA_FALSE);
1554 if (new_focusable) 1554 if (new_focusable)
1555 efl_ui_focus_object_focus_set(new_focusable, EINA_TRUE); 1555 efl_ui_focus_object_focus_set(new_focusable, EINA_TRUE);
1556 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, last_focusable); 1556 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, last_focusable);
1557 } 1557 }
1558 1558
1559 _current_focused_parent_to_array(obj, pd, chain); 1559 _current_focused_parent_to_array(obj, pd, chain);
@@ -1868,7 +1868,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_reset_history(Eo *obj EINA_UNUSE
1868 1868
1869 pd->focus_stack = eina_list_free(pd->focus_stack); 1869 pd->focus_stack = eina_list_free(pd->focus_stack);
1870 1870
1871 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, last_focusable); 1871 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, last_focusable);
1872} 1872}
1873 1873
1874EOLIAN static void 1874EOLIAN static void
@@ -1909,7 +1909,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_pop_history_stack(Eo *obj EINA_U
1909 efl_ui_focus_manager_focus_set(obj, last->focusable); 1909 efl_ui_focus_manager_focus_set(obj, last->focusable);
1910 } 1910 }
1911 1911
1912 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, last_focusable); 1912 efl_event_callback_call(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, last_focusable);
1913} 1913}
1914 1914
1915EOLIAN static Efl_Ui_Focus_Object* 1915EOLIAN static Efl_Ui_Focus_Object*
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 60a8c31e93..955313fa5a 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -678,7 +678,7 @@ _efl_ui_list_view_efl_object_constructor(Eo *obj, Efl_Ui_List_View_Data *pd)
678 678
679 pd->seg_array = efl_ui_list_view_seg_array_setup(32); 679 pd->seg_array = efl_ui_list_view_seg_array_setup(32);
680 680
681 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _list_element_focused, NULL); 681 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _list_element_focused, NULL);
682 682
683 efl_ui_focus_composition_custom_manager_set(obj, obj); 683 efl_ui_focus_composition_custom_manager_set(obj, obj);
684 efl_ui_focus_composition_logical_mode_set(obj, EINA_TRUE); 684 efl_ui_focus_composition_logical_mode_set(obj, EINA_TRUE);
@@ -695,7 +695,7 @@ _efl_ui_list_view_efl_object_constructor(Eo *obj, Efl_Ui_List_View_Data *pd)
695EOLIAN static void 695EOLIAN static void
696_efl_ui_list_view_efl_object_destructor(Eo *obj, Efl_Ui_List_View_Data *pd) 696_efl_ui_list_view_efl_object_destructor(Eo *obj, Efl_Ui_List_View_Data *pd)
697{ 697{
698 efl_event_callback_del(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, 698 efl_event_callback_del(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED,
699 _list_element_focused, NULL); 699 _list_element_focused, NULL);
700 700
701 _efl_ui_list_view_edje_object_detach(obj); 701 _efl_ui_list_view_edje_object_detach(obj);
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 7185866a44..97e613014d 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -996,8 +996,8 @@ _legacy_focused(void *data, const Efl_Event *ev)
996static void 996static void
997_legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) 997_legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
998{ 998{
999 efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _legacy_focused, ev->object); 999 efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _legacy_focused, ev->object);
1000 efl_event_callback_add(efl_ui_focus_object_focus_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _legacy_focused, ev->object); 1000 efl_event_callback_add(efl_ui_focus_object_focus_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _legacy_focused, ev->object);
1001} 1001}
1002 1002
1003EOLIAN static Eo * 1003EOLIAN static Eo *
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index 5c9651fb15..d77274fb6c 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -413,7 +413,7 @@ legacy_efl_ui_focus_manager_widget_legacy_signals(Efl_Ui_Focus_Manager *manager,
413 state->emittee = emittee; 413 state->emittee = emittee;
414 state->focused = EINA_FALSE; 414 state->focused = EINA_FALSE;
415 415
416 efl_event_callback_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _focus_manager_focused, state); 416 efl_event_callback_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _focus_manager_focused, state);
417 efl_event_callback_add(manager, EFL_EVENT_DEL, _focus_manager_del, state); 417 efl_event_callback_add(manager, EFL_EVENT_DEL, _focus_manager_del, state);
418} 418}
419 419
@@ -443,10 +443,10 @@ _manager_focus_object_changed(void *data, const Efl_Event *ev EINA_UNUSED)
443{ 443{
444 Legacy_Object_Focus_State *state = data; 444 Legacy_Object_Focus_State *state = data;
445 if (state->registered_manager) 445 if (state->registered_manager)
446 efl_event_callback_del(state->registered_manager, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _manager_focus_changed, state); 446 efl_event_callback_del(state->registered_manager, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _manager_focus_changed, state);
447 state->registered_manager = efl_ui_focus_object_focus_manager_get(state->emittee); 447 state->registered_manager = efl_ui_focus_object_focus_manager_get(state->emittee);
448 if (state->registered_manager) 448 if (state->registered_manager)
449 efl_event_callback_add(state->registered_manager, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _manager_focus_changed, state); 449 efl_event_callback_add(state->registered_manager, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _manager_focus_changed, state);
450} 450}
451 451
452void 452void
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index f321edf9bb..778c950f19 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4364,7 +4364,7 @@ _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd)
4364 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4364 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4365 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE); 4365 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE);
4366 4366
4367 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _gengrid_element_focused, obj); 4367 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _gengrid_element_focused, obj);
4368 4368
4369 return obj; 4369 return obj;
4370} 4370}
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 2a7e3e89fb..b290efcd85 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5990,7 +5990,7 @@ _elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd)
5990 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 5990 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
5991 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); 5991 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
5992 5992
5993 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _genlist_element_focused, obj); 5993 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _genlist_element_focused, obj);
5994 5994
5995 return obj; 5995 return obj;
5996} 5996}
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 3c67f0af46..f2dd116cd3 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -59,7 +59,7 @@ _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, Eo *obj
59{ 59{
60 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, obj); 60 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, obj);
61 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, obj); 61 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, obj);
62 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED , obj); 62 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED , obj);
63 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, obj); 63 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, obj);
64 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, obj); 64 efl_event_callback_forwarder_del(manager, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, obj);
65} 65}
@@ -69,7 +69,7 @@ _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, Eo *obj
69{ 69{
70 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, obj); 70 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, obj);
71 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, obj); 71 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, obj);
72 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED , obj); 72 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED , obj);
73 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, obj); 73 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, obj);
74 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, obj); 74 efl_event_callback_forwarder_add(manager, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, obj);
75} 75}
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index b32067e2cf..a86c158836 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -898,7 +898,7 @@ _elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED
898 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 898 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
899 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 899 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
900 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SCROLL_PANE); 900 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SCROLL_PANE);
901 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED, _focused_element, obj); 901 efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _focused_element, obj);
902 legacy_efl_ui_focus_manager_widget_legacy_signals(obj, obj); 902 legacy_efl_ui_focus_manager_widget_legacy_signals(obj, obj);
903 903
904 return obj; 904 return obj;
diff --git a/src/tests/elementary/efl_ui_test_focus_sub.c b/src/tests/elementary/efl_ui_test_focus_sub.c
index 1c103a1e6d..415e096ea1 100644
--- a/src/tests/elementary/efl_ui_test_focus_sub.c
+++ b/src/tests/elementary/efl_ui_test_focus_sub.c
@@ -100,7 +100,7 @@ _setup(Efl_Ui_Focus_Manager **m, Efl_Ui_Focus_Manager_Sub **sub, Efl_Ui_Focus_Ob
100 ); 100 );
101 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, focus_main); 101 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE, focus_main);
102 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, focus_main); 102 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED, focus_main);
103 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_FOCUS_CHANGED , focus_main); 103 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED , focus_main);
104 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, focus_main); 104 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY, focus_main);
105 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, focus_main); 105 efl_event_callback_forwarder_add(subm, EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED, focus_main);
106 106