efl.pack_table: inherit efl.pack instead of efl.pack_linear

Summary:
>>! In T5301#110572, @jpeg wrote:
> Quick recap before I leave.
> ...
> ...
>  - Pack interfaces - T5328
>
> Table does not need to inherit from "linear" (1d) layout: this brings unnecessary complexity, for a dubious use case.

We don't have linear layout policy of table(2d) layout. furthermore, i don't
think it will be clearly defined. it is enough for Efl.Pack_Table to support
`efl_pack` which work the same as `efl_pack_end`.

ref T5719, T5328

Test Plan:
- make
- elementary_test -to 'efl.ui.table'
- elementary_test -to 'efl.ui.table(linear api)'

Reviewers: zmike, woohyun, segfaultxavi

Reviewed By: segfaultxavi

Subscribers: cedric, #reviewers, jpeg, #committers

Tags: #efl

Maniphest Tasks: T5719, T5328

Differential Revision: https://phab.enlightenment.org/D8420

diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index f0e63d2ac38d9e213f0cedcd486b576382d16198..d11cefe43b04c452f681bb27be7e04bf851c39c7 100644 (file)
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -545,7 +545,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
    efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
    efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
    elm_object_tooltip_text_set(o, "Click to unpack");
-   efl_pack_end(table, o);
+   efl_pack(table, o);
    efl_gfx_entity_visible_set(o, 1);
 }
 

diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo
index ea88ca61dacf9138a457f43aec4cd3eff6e22bae..9472b52ed4608fe6753f9ed3bd15c2cbb2c9e5f3 100644 (file)
--- a/src/lib/efl/interfaces/efl_pack_table.eo
+++ b/src/lib/efl/interfaces/efl_pack_table.eo
@@ -1,6 +1,6 @@
 import efl_ui_direction;
 
-interface @beta Efl.Pack_Table extends Efl.Pack_Linear
+interface @beta Efl.Pack_Table extends Efl.Pack
 {
    [[2D containers aligned on a table with rows and columns]]
    eo_prefix: efl_pack;

diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 7fe398d1ed3ae69915188b0268d6e08766989cd1..50fd0be834ee559406a169c5bac284651fba408c 100644 (file)
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -719,14 +719,7 @@ _efl_ui_table_efl_pack_table_table_rows_get(const Eo *obj EINA_UNUSED, Efl_Ui_Ta
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
-{
-   /* this is just an alias */
-   return efl_pack_end(obj, subobj);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_table_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
+_efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
 

diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo
index 3e3753a94c33d0d404658326f3474529a6232d9e..7bcf3195a12f7b5e1a655d2f6753b08941fd87ce 100644 (file)
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -38,7 +38,6 @@ class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pa
       Efl.Pack_Table.table_columns { get; set; }
       Efl.Pack_Table.table_rows { get; set; }
       Efl.Pack_Table.table_direction { get; set; }
-      Efl.Pack_Linear.pack_end;
       Efl.Pack_Layout.layout_update;
       Efl.Pack_Layout.layout_request;
    }