introduce group item

this brings a group item in the style of genlist / gengrid group items.

The group item theme does currently not provide the signals in the theme
that would be needed for selecting it. This is kind of intended, but we
might need API to express that.

ref T8115

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D9583

4 files changed, 49 insertions, 20 deletions

diff --git a/src/tests/elementary/spec/efl_test_container.c b/src/tests/elementary/spec/efl_test_container.c
index ecef9b1740..a78390dc03 100644
--- a/src/tests/elementary/spec/efl_test_container.c
+++ b/src/tests/elementary/spec/efl_test_container.c
@@ -6,6 +6,21 @@
 #include "efl_ui_spec_suite.h"
 #include "suite_helpers.h"
 
+
+Efl_Ui_Widget*
+efl_test_parent_get(Eo *obj)
+{
+   if (efl_isa(widget, EFL_UI_GROUP_ITEM_CLASS))
+     {
+        return efl_ui_item_parent_get(obj);
+     }
+   else
+     {
+        return efl_ui_widget_parent_get(obj);
+     }
+}
+
+
 void
 efl_test_container_content_equal(Efl_Ui_Widget **wid, unsigned int len)
 {
diff --git a/src/tests/elementary/spec/efl_test_pack.c b/src/tests/elementary/spec/efl_test_pack.c
index ab3b19615c..9ecc356610 100644
--- a/src/tests/elementary/spec/efl_test_pack.c
+++ b/src/tests/elementary/spec/efl_test_pack.c
@@ -137,7 +137,7 @@ EFL_START_TEST(unpack1)
    _setup_std_pack(wid);
 
    ck_assert_int_eq(efl_pack_unpack(widget, wid[2]), EINA_TRUE);
-   ck_assert_ptr_ne(efl_ui_widget_parent_get(wid[2]), widget);
+   ck_assert_ptr_ne(efl_test_parent_get(wid[2]), widget);
    ck_assert_int_eq(efl_ref_count(wid[2]), 1);
    efl_test_container_content_equal(wid, 2);
 }
@@ -198,7 +198,7 @@ EFL_START_TEST(pack1)
    for (i = 0; i < sizeof(wid)/sizeof(Efl_Ui_Widget*); ++i)
      {
         ck_assert_int_eq(efl_ref_count(wid[i]), 1);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(wid[i]), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(wid[i]), widget);
      }
 
    efl_test_container_content_equal(wid, 3);
@@ -292,6 +292,7 @@ EFL_END_TEST
 void
 efl_pack_behavior_test(TCase *tc)
 {
+   tcase_add_test(tc, pack2);
    tcase_add_test(tc, base2);
    tcase_add_test(tc, pack_clear1);
    tcase_add_test(tc, pack_clear2);
@@ -301,7 +302,6 @@ efl_pack_behavior_test(TCase *tc)
    tcase_add_test(tc, unpack2);
    tcase_add_test(tc, unpack3);
    tcase_add_test(tc, pack1);
-   tcase_add_test(tc, pack2);
    tcase_add_test(tc, pack3);
    tcase_add_test(tc, evt_content_added);
    tcase_add_test(tc, evt_content_removed);
diff --git a/src/tests/elementary/spec/efl_test_pack_linear.c b/src/tests/elementary/spec/efl_test_pack_linear.c
index 71746eaeee..eed26e6b5f 100644
--- a/src/tests/elementary/spec/efl_test_pack_linear.c
+++ b/src/tests/elementary/spec/efl_test_pack_linear.c
@@ -9,10 +9,11 @@
 
 /* spec-meta-start
       {"test-interface":"Efl.Pack_Linear",
-       "test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Efl.Ui.List"],
+       "test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Efl.Ui.List", "Efl.Ui.Group_Item" ],
        "custom-mapping" : {
           "Efl.Ui.Grid" : "EFL_UI_GRID_DEFAULT_ITEM_CLASS",
-          "Efl.Ui.List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS"
+          "Efl.Ui.List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS",
+          "Efl.Ui.Group_Item" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS"
         }
        }
    spec-meta-end */
@@ -46,7 +47,7 @@ EFL_START_TEST(pack_begin1)
    for (int i = 2; i >= 0; i--)
      {
         efl_pack_begin(widget, wid[i]);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(wid[i]), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(wid[i]), widget);
      }
    _ordering_equals(wid, 3);
    efl_pack_begin(widget, inv);
@@ -65,7 +66,7 @@ EFL_START_TEST(pack_begin2)
    for (int i = 2; i >= 0; i--)
      {
         efl_pack_begin(widget, wid[i]);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(wid[i]), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(wid[i]), widget);
      }
 
    EXPECT_ERROR_START;
@@ -85,7 +86,7 @@ EFL_START_TEST(pack_end1)
    for (int i = 0; i < 3; i++)
      {
         efl_pack_end(widget, wid[i]);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(wid[i]), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(wid[i]), widget);
      }
 
    _ordering_equals(wid, 3);
@@ -105,7 +106,7 @@ EFL_START_TEST(pack_end2)
    for (int i = 0; i < 3; i++)
      {
         efl_pack_end(widget, wid[i]);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(wid[i]), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(wid[i]), widget);
      }
 
    EXPECT_ERROR_START;
@@ -126,13 +127,13 @@ EFL_START_TEST(pack_before1)
      efl_pack_end(widget, wid[i]);
 
    ck_assert_int_eq(efl_pack_before(widget, inv, wid[0]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid2[] = {inv, wid[0], wid[1], wid[2]};
    _ordering_equals(wid2, 4);
    efl_pack_unpack(widget, inv);
 
    ck_assert_int_eq(efl_pack_before(widget, inv, wid[2]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid3[] = {wid[0], wid[1], inv, wid[2]};
    _ordering_equals(wid3, 4);
 }
@@ -149,7 +150,7 @@ EFL_START_TEST(pack_before2)
      efl_pack_end(widget, wid[i]);
 
    ck_assert_int_eq(efl_pack_before(widget, inv, wid[0]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid2[] = {inv, wid[0], wid[1], wid[2]};
    _ordering_equals(wid2, 4);
 
@@ -170,13 +171,13 @@ EFL_START_TEST(pack_after1)
      efl_pack_end(widget, wid[i]);
 
    ck_assert_int_eq(efl_pack_after(widget, inv, wid[0]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid2[] = {wid[0], inv, wid[1], wid[2]};
    _ordering_equals(wid2, 4);
    efl_pack_unpack(widget, inv);
 
    ck_assert_int_eq(efl_pack_after(widget, inv, wid[2]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid3[] = {wid[0], wid[1], wid[2], inv};
    _ordering_equals(wid3, 4);
 }
@@ -193,7 +194,7 @@ EFL_START_TEST(pack_after2)
      efl_pack_end(widget, wid[i]);
 
    ck_assert_int_eq(efl_pack_after(widget, inv, wid[0]), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    Efl_Ui_Widget *wid2[] = {wid[0], inv, wid[1], wid[2]};
    _ordering_equals(wid2, 4);
 
@@ -216,7 +217,7 @@ EFL_START_TEST(pack_at1)
           efl_pack_end(widget, wid[i]);
 
         efl_pack_at(widget, inv, x);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
 
         for (i = 0; i < 4; ++i)
           {
@@ -247,7 +248,7 @@ EFL_START_TEST(pack_at2)
           efl_pack_end(widget, wid[i]);
 
         ck_assert_int_eq(efl_pack_at(widget, inv, x), EINA_TRUE);
-        ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+        ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
 
         EXPECT_ERROR_START;
         ck_assert_int_eq(efl_pack_at(widget, inv, x - 1), EINA_FALSE);
@@ -281,9 +282,9 @@ EFL_START_TEST(pack_at3)
      efl_pack_end(widget, wid[i]);
 
    ck_assert_int_eq(efl_pack_at(widget,  inv,-100000), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv), widget);
    ck_assert_int_eq(efl_pack_at(widget, inv2, 100000), EINA_TRUE);
-   ck_assert_ptr_eq(efl_ui_widget_parent_get(inv2), widget);
+   ck_assert_ptr_eq(efl_test_parent_get(inv2), widget);
    Efl_Ui_Widget *wid2[] = {inv, wid[0], wid[1], wid[2], inv2};
    _ordering_equals(wid2, 5);
 }
@@ -377,15 +378,27 @@ EFL_START_TEST(pack_unpack_at3)
           efl_pack_end(widget, wid[i]);
         ck_assert_ptr_eq(efl_pack_unpack_at(widget, x), wid[(3+x)%3]);
         ck_assert_int_eq(efl_content_count(widget), 2);
-        ck_assert_ptr_ne(efl_ui_widget_parent_get(wid[(3+x)%3]), widget);
+        ck_assert_ptr_ne(efl_test_parent_get(wid[(3+x)%3]), widget);
         efl_pack_unpack_all(widget);
      }
 }
 EFL_END_TEST
 
 void
+object_setup(void)
+{
+   if (efl_isa(widget, EFL_UI_GROUP_ITEM_CLASS))
+     {
+        Efl_Ui_Collection *collection = efl_add(EFL_UI_GRID_CLASS, win);
+        efl_content_set(win, collection);
+        efl_pack_end(collection, widget);
+     }
+}
+
+void
 efl_pack_linear_behavior_test(TCase *tc)
 {
+   tcase_add_checked_fixture(tc, object_setup, NULL);
    tcase_add_test(tc, pack_begin1);
    tcase_add_test(tc, pack_begin2);
    tcase_add_test(tc, pack_end1);
diff --git a/src/tests/elementary/spec/efl_ui_spec_suite.h b/src/tests/elementary/spec/efl_ui_spec_suite.h
index a4bceeaf54..009e4e0ec5 100644
--- a/src/tests/elementary/spec/efl_ui_spec_suite.h
+++ b/src/tests/elementary/spec/efl_ui_spec_suite.h
@@ -25,6 +25,7 @@ void efl_ui_selectable_behavior_test(TCase *tc);
 
 void efl_test_container_content_equal(Efl_Ui_Widget **wid, unsigned int len);
 void efl_test_container_expect_evt_content_added(Efl_Ui_Widget *widget, const Efl_Event_Description *ev, Eina_Bool *flag, void *event_data);
+Efl_Ui_Widget* efl_test_parent_get(Eo *obj);
 
 Eo* create_test_widget(void);