diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build index 6c453298f3..b490b57881 100644 --- a/src/bin/elementary/meson.build +++ b/src/bin/elementary/meson.build @@ -156,7 +156,7 @@ elementary_test_src = [ 'test_gesture_framework.c', 'test_ui_tab_pager.c', 'test_ui_relative_layout.c', - 'test_ui_item_container.c', + 'test_ui_collection.c', 'test_ui_items.c', 'test_ui_frame.c', 'test.h' diff --git a/src/bin/elementary/test_ui_item_container.c b/src/bin/elementary/test_ui_collection.c similarity index 94% rename from src/bin/elementary/test_ui_item_container.c rename to src/bin/elementary/test_ui_collection.c index ec2b2dfb8c..f049fb0dc4 100644 --- a/src/bin/elementary/test_ui_item_container.c +++ b/src/bin/elementary/test_ui_collection.c @@ -158,7 +158,7 @@ _select_value_cb(void *data, const Efl_Event *ev) efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object)); } -void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl_Class *item, const char *name) +void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class *item, const char *name) { Efl_Ui_Win *win, *o, *tbl, *item_container, *bx; Match_Content_Ctx *ctx = calloc(1, sizeof(*ctx)); @@ -170,8 +170,7 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl tbl = efl_add(EFL_UI_TABLE_CLASS, win); efl_content_set(win, tbl); - item_container = o = efl_add(EFL_UI_COLLECTION_CLASS, win, - efl_ui_collection_position_manager_set(efl_added, manager)); + item_container = o = efl_add(collection_class, win); efl_key_data_set(o, "__item_class", item); efl_event_callback_add(o, EFL_EVENT_DEL, _widget_del_cb, ctx); for (int i = 0; i < 2000; ++i) @@ -278,12 +277,12 @@ void test_efl_ui_collection_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - create_item_container_ui(efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS), EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Item_Container Grid"); + create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid"); } void test_efl_ui_collection_list(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - create_item_container_ui(efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS), EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.Item_Container List"); + create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List"); }