summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-24 17:57:01 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-25 20:27:39 +0200
commita4f7baa911a07d225e81d747bd7d79a177aae552 (patch)
treeaff892ace767ef9e35784a690bf59e9937c32bc3 /src/bin
parent167d2475e8f879e96d80fa4a03eb3ab06098bfe5 (diff)
rename efl_ui_item_container -> efl_ui_collection
this is the first rename of the main widget, the renames of the test suites will follow Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D9408
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/elementary/test.c8
-rw-r--r--src/bin/elementary/test_ui_item_container.c18
2 files changed, 13 insertions, 13 deletions
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 2062f18acb..79d56af40e 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -394,8 +394,8 @@ void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info);
394 394
395void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info); 395void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info);
396void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info); 396void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info);
397void test_efl_ui_item_container_list(void *data, Evas_Object *obj, void *event_info ); 397void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info );
398void test_efl_ui_item_container_grid(void *data, Evas_Object *obj, void *event_info); 398void test_efl_ui_collection_grid(void *data, Evas_Object *obj, void *event_info);
399static void _list_udpate(void); 399static void _list_udpate(void);
400 400
401static Evas_Object *win, *tbx, *entry; // TODO: refactoring 401static Evas_Object *win, *tbx, *entry; // TODO: refactoring
@@ -869,8 +869,8 @@ add_tests:
869 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear); 869 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear);
870 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static); 870 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static);
871 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout); 871 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout);
872 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Item_Container List", test_efl_ui_item_container_list); 872 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection List", test_efl_ui_collection_list);
873 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Item_Container Grid", test_efl_ui_item_container_grid); 873 ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection Grid", test_efl_ui_collection_grid);
874 874
875 //------------------------------// 875 //------------------------------//
876 ADD_TEST_EO(NULL, "Events", "Event Refeed", test_events); 876 ADD_TEST_EO(NULL, "Events", "Event Refeed", test_events);
diff --git a/src/bin/elementary/test_ui_item_container.c b/src/bin/elementary/test_ui_item_container.c
index af82d7a6d9..97f3f0797b 100644
--- a/src/bin/elementary/test_ui_item_container.c
+++ b/src/bin/elementary/test_ui_item_container.c
@@ -20,7 +20,7 @@ _scroll_to_animated_cb(void *data, const Efl_Event *ev EINA_UNUSED)
20 20
21 EINA_SAFETY_ON_NULL_RETURN(element_1154); 21 EINA_SAFETY_ON_NULL_RETURN(element_1154);
22 22
23 efl_ui_item_container_item_scroll(data, element_1154, EINA_TRUE); 23 efl_ui_collection_item_scroll(data, element_1154, EINA_TRUE);
24} 24}
25 25
26static void 26static void
@@ -30,7 +30,7 @@ _scroll_to_cb(void *data, const Efl_Event *ev EINA_UNUSED)
30 30
31 EINA_SAFETY_ON_NULL_RETURN(element_10); 31 EINA_SAFETY_ON_NULL_RETURN(element_10);
32 32
33 efl_ui_item_container_item_scroll(data, element_10, EINA_FALSE); 33 efl_ui_collection_item_scroll(data, element_10, EINA_FALSE);
34} 34}
35 35
36static void 36static void
@@ -54,7 +54,7 @@ _change_min_size_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
54 54
55typedef struct { 55typedef struct {
56 Efl_Ui_Check *v, *h; 56 Efl_Ui_Check *v, *h;
57 Efl_Ui_Item_Container *c; 57 Efl_Ui_Collection *c;
58} Match_Content_Ctx; 58} Match_Content_Ctx;
59 59
60static void 60static void
@@ -76,7 +76,7 @@ _widget_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
76} 76}
77 77
78static void 78static void
79_add_item(Efl_Ui_Item_Container *c) 79_add_item(Efl_Ui_Collection *c)
80{ 80{
81 Efl_Class *itc = efl_key_data_get(c, "__item_class"); 81 Efl_Class *itc = efl_key_data_get(c, "__item_class");
82 char buf[PATH_MAX]; 82 char buf[PATH_MAX];
@@ -143,7 +143,7 @@ _add_thousend_items(void *data, const Efl_Event *ev EINA_UNUSED)
143static void 143static void
144_select_value_cb(void *data, const Efl_Event *ev) 144_select_value_cb(void *data, const Efl_Event *ev)
145{ 145{
146 Efl_Ui_Item_Container *c = data; 146 Efl_Ui_Collection *c = data;
147 147
148 efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object)); 148 efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object));
149} 149}
@@ -160,8 +160,8 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
160 tbl = efl_add(EFL_UI_TABLE_CLASS, win); 160 tbl = efl_add(EFL_UI_TABLE_CLASS, win);
161 efl_content_set(win, tbl); 161 efl_content_set(win, tbl);
162 162
163 item_container = o = efl_add(EFL_UI_ITEM_CONTAINER_CLASS, win, 163 item_container = o = efl_add(EFL_UI_COLLECTION_CLASS, win,
164 efl_ui_item_container_position_manager_set(efl_added, manager)); 164 efl_ui_collection_position_manager_set(efl_added, manager));
165 efl_key_data_set(o, "__item_class", item); 165 efl_key_data_set(o, "__item_class", item);
166 efl_event_callback_add(o, EFL_EVENT_DEL, _widget_del_cb, ctx); 166 efl_event_callback_add(o, EFL_EVENT_DEL, _widget_del_cb, ctx);
167 for (int i = 0; i < 2000; ++i) 167 for (int i = 0; i < 2000; ++i)
@@ -257,14 +257,14 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
257 efl_pack_end(bx, o); 257 efl_pack_end(bx, o);
258} 258}
259 259
260void test_efl_ui_item_container_grid(void *data EINA_UNUSED, 260void test_efl_ui_collection_grid(void *data EINA_UNUSED,
261 Evas_Object *obj EINA_UNUSED, 261 Evas_Object *obj EINA_UNUSED,
262 void *event_info EINA_UNUSED) 262 void *event_info EINA_UNUSED)
263{ 263{
264 create_item_container_ui(efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS), EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Item_Container Grid"); 264 create_item_container_ui(efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS), EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Item_Container Grid");
265} 265}
266 266
267void test_efl_ui_item_container_list(void *data EINA_UNUSED, 267void test_efl_ui_collection_list(void *data EINA_UNUSED,
268 Evas_Object *obj EINA_UNUSED, 268 Evas_Object *obj EINA_UNUSED,
269 void *event_info EINA_UNUSED) 269 void *event_info EINA_UNUSED)
270{ 270{