summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-06 13:02:38 -0800
commit461c45df468aa284feac46e291036201fc88f413 (patch)
tree1ca19a345735095a6e328ce5734de71971909c67 /src
parentef5853b6d5196e44ae43a9a6561e5cc7b1daa7a0 (diff)
efl_ui_multi_selectable: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in evas and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8120
Diffstat (limited to 'src')
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c8
-rw-r--r--src/lib/efl/interfaces/efl_ui_multi_selectable.eo1
-rw-r--r--src/lib/elementary/efl_ui_grid.c10
-rw-r--r--src/lib/elementary/efl_ui_item.c8
-rw-r--r--src/lib/elementary/efl_ui_list.c10
5 files changed, 18 insertions, 19 deletions
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index c34aa0ff53..5893a59864 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -235,24 +235,24 @@ elm_main(int argc EINA_UNUSED, char **argv)
235 235
236 select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox); 236 select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
237 efl_text_set(radio, "SINGLE"); 237 efl_text_set(radio, "SINGLE");
238 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_SINGLE); 238 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_SINGLE);
239 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list); 239 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
240 efl_pack_end(bbox, radio); 240 efl_pack_end(bbox, radio);
241 radio = efl_add(EFL_UI_RADIO_CLASS, wbox); 241 radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
242 efl_text_set(radio, "SINGLE_ALWAYS"); 242 efl_text_set(radio, "SINGLE_ALWAYS");
243 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_SINGLE_ALWAYS); 243 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_SINGLE_ALWAYS);
244 efl_ui_radio_group_add(radio, select_radio); 244 efl_ui_radio_group_add(radio, select_radio);
245 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list); 245 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
246 efl_pack_end(bbox, radio); 246 efl_pack_end(bbox, radio);
247 radio = efl_add(EFL_UI_RADIO_CLASS, wbox); 247 radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
248 efl_text_set(radio, "MULTI"); 248 efl_text_set(radio, "MULTI");
249 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MULTI); 249 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_MULTI);
250 efl_ui_radio_group_add(radio, select_radio); 250 efl_ui_radio_group_add(radio, select_radio);
251 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list); 251 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
252 efl_pack_end(bbox, radio); 252 efl_pack_end(bbox, radio);
253 radio = efl_add(EFL_UI_RADIO_CLASS, wbox); 253 radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
254 efl_text_set(radio, "NONE"); 254 efl_text_set(radio, "NONE");
255 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_NONE); 255 efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_NONE);
256 efl_ui_radio_group_add(radio, select_radio); 256 efl_ui_radio_group_add(radio, select_radio);
257 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list); 257 efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
258 efl_pack_end(bbox, radio); 258 efl_pack_end(bbox, radio);
diff --git a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
index 90c825f223..4285c2dee7 100644
--- a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
@@ -1,6 +1,5 @@
1enum Efl.Ui.Select_Mode { 1enum Efl.Ui.Select_Mode {
2 [[Type of multi selectable object.]] 2 [[Type of multi selectable object.]]
3 legacy: efl_ui_select;
4 single, [[Only single child is selected. if the child is selected, 3 single, [[Only single child is selected. if the child is selected,
5 previous selected child will be unselected.]] 4 previous selected child will be unselected.]]
6 single_always, [[Same as single select except, this will be selected 5 single_always, [[Same as single select except, this will be selected
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index d70bf565ac..18e9144077 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -576,7 +576,7 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
576 efl_ui_scroll_manager_pan_set(pd->smanager, pd->pan); 576 efl_ui_scroll_manager_pan_set(pd->smanager, pd->pan);
577 edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan); 577 edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan);
578 578
579 pd->select_mode = EFL_UI_SELECT_SINGLE; 579 pd->select_mode = EFL_UI_SELECT_MODE_SINGLE;
580 580
581 if ((pd->item.size.w == 0) && (pd->item.size.h == 0)) 581 if ((pd->item.size.w == 0) && (pd->item.size.h == 0))
582 { 582 {
@@ -891,7 +891,7 @@ _grid_item_selected(void *data, const Efl_Event *event)
891 EFL_UI_GRID_DATA_GET_OR_RETURN(obj, pd); 891 EFL_UI_GRID_DATA_GET_OR_RETURN(obj, pd);
892 892
893 /* Single Select */ 893 /* Single Select */
894 if (pd->select_mode != EFL_UI_SELECT_MULTI) 894 if (pd->select_mode != EFL_UI_SELECT_MODE_MULTI)
895 { 895 {
896 EINA_LIST_FREE(pd->selected, selected) 896 EINA_LIST_FREE(pd->selected, selected)
897 { 897 {
@@ -1222,9 +1222,9 @@ _efl_ui_grid_efl_ui_multi_selectable_select_mode_set(Eo *obj EINA_UNUSED,
1222{ 1222{
1223 Efl_Ui_Grid_Item *selected; 1223 Efl_Ui_Grid_Item *selected;
1224 1224
1225 if ((pd->select_mode == EFL_UI_SELECT_MULTI && 1225 if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
1226 mode != EFL_UI_SELECT_MULTI) || 1226 mode != EFL_UI_SELECT_MODE_MULTI) ||
1227 mode == EFL_UI_SELECT_NONE) 1227 mode == EFL_UI_SELECT_MODE_NONE)
1228 { 1228 {
1229 Eina_List *clone = eina_list_clone(pd->selected); 1229 Eina_List *clone = eina_list_clone(pd->selected);
1230 EINA_LIST_FREE(clone, selected) 1230 EINA_LIST_FREE(clone, selected)
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index aad857bb24..6070bda7a9 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -19,9 +19,9 @@ static void
19_item_select(Eo *obj, Efl_Ui_Item_Data *pd) 19_item_select(Eo *obj, Efl_Ui_Item_Data *pd)
20{ 20{
21 if (pd->selected && 21 if (pd->selected &&
22 (*(pd->select_mode) != EFL_UI_SELECT_SINGLE_ALWAYS)) 22 (*(pd->select_mode) != EFL_UI_SELECT_MODE_SINGLE_ALWAYS))
23 return; 23 return;
24 if (*(pd->select_mode) == EFL_UI_SELECT_NONE) return; 24 if (*(pd->select_mode) == EFL_UI_SELECT_MODE_NONE) return;
25 25
26 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 26 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
27 27
@@ -101,9 +101,9 @@ _item_mouse_up(void *data,
101 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl"); 101 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
102 efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL); 102 efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL);
103 103
104 if ((*(pd->select_mode) != EFL_UI_SELECT_SINGLE_ALWAYS) && (pd->selected)) 104 if ((*(pd->select_mode) != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected))
105 _item_unselect(item, pd); 105 _item_unselect(item, pd);
106 else if (*(pd->select_mode) != EFL_UI_SELECT_NONE) 106 else if (*(pd->select_mode) != EFL_UI_SELECT_MODE_NONE)
107 _item_select(item, pd); 107 _item_select(item, pd);
108} 108}
109 109
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 8c8cd0362c..bcaca6e10b 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -444,7 +444,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
444 efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj)); 444 efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj));
445 efl_content_set(pd->pan, pd->box); 445 efl_content_set(pd->pan, pd->box);
446 446
447 pd->select_mode = EFL_UI_SELECT_SINGLE; 447 pd->select_mode = EFL_UI_SELECT_MODE_SINGLE;
448 448
449 _scroll_edje_object_attach(obj); 449 _scroll_edje_object_attach(obj);
450 450
@@ -646,7 +646,7 @@ _list_item_selected(void *data, const Efl_Event *event)
646 EFL_UI_LIST_DATA_GET_OR_RETURN(obj, pd); 646 EFL_UI_LIST_DATA_GET_OR_RETURN(obj, pd);
647 647
648 /* Single Select */ 648 /* Single Select */
649 if (pd->select_mode != EFL_UI_SELECT_MULTI) 649 if (pd->select_mode != EFL_UI_SELECT_MODE_MULTI)
650 { 650 {
651 EINA_LIST_FREE(pd->selected, selected) 651 EINA_LIST_FREE(pd->selected, selected)
652 { 652 {
@@ -935,9 +935,9 @@ _efl_ui_list_efl_ui_multi_selectable_select_mode_set(Eo *obj EINA_UNUSED,
935{ 935{
936 Efl_Ui_List_Item *selected; 936 Efl_Ui_List_Item *selected;
937 937
938 if ((pd->select_mode == EFL_UI_SELECT_MULTI && 938 if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
939 mode != EFL_UI_SELECT_MULTI) || 939 mode != EFL_UI_SELECT_MODE_MULTI) ||
940 mode == EFL_UI_SELECT_NONE) 940 mode == EFL_UI_SELECT_MODE_NONE)
941 { 941 {
942 Eina_List *clone = eina_list_clone(pd->selected); 942 Eina_List *clone = eina_list_clone(pd->selected);
943 EINA_LIST_FREE(clone, selected) 943 EINA_LIST_FREE(clone, selected)