efl_ui_layout_part_box/table: remove real_part_set

real part set was used to set the real part on the part, so the obj
pointer of Layout_Part_Data points to the correct evas object. With this
commit, this API is removed from the public .eo files, and is refactored
into the same API which is private.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D9993

diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index f758a3c..bb4819c 100644 (file)
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -41,6 +41,15 @@ struct _Layout_Part_Data
    unsigned char          temp;
 };
 
+static void
+_efl_ui_layout_part_set_real_part(Eo *obj, struct _Layout_Part_Data *pd, Eo *layout, const char *part)
+{
+   pd->obj = layout;
+   pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_BASE_CLASS, obj);
+   eina_stringshare_replace(&pd->part, part);
+   pd->temp = 1;
+}
+
 Eo *
 _efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part)
 {
@@ -49,13 +58,13 @@ _efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const cha
                     /* TIZEN_ONLY(20180508): fix layout_part_cursor things and eo hierarchy of part_box/part_table */
                     _elm_part_initialize(efl_added, obj, part),
                     /* END */
-                   efl_ui_layout_part_box_real_part_set(efl_added, obj, part));
+                   _efl_ui_layout_part_set_real_part(efl_added, efl_data_scope_get(efl_added, BOX_CLASS), obj, part));
    else if (type == EDJE_PART_TYPE_TABLE)
      return efl_add(TABLE_CLASS, obj,
                     /* TIZEN_ONLY(20180508): fix layout_part_cursor things and eo hierarchy of part_box/part_table */
                     _elm_part_initialize(efl_added, obj, part),
                     /* END */
-                   efl_ui_layout_part_table_real_part_set(efl_added, obj, part));
+                   _efl_ui_layout_part_set_real_part(efl_added, efl_data_scope_get(efl_added, TABLE_CLASS), obj, part));
    else
      return NULL;
 }
@@ -69,15 +78,6 @@ _efl_ui_layout_part_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data
    efl_destructor(efl_super(obj, BOX_CLASS));
 }
 
-EOLIAN static void
-_efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
-{
-   pd->obj = layout;
-   pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_BASE_CLASS, obj);
-   eina_stringshare_replace(&pd->part, part);
-   pd->temp = 1;
-}
-
 EOLIAN static Eina_Iterator *
 _efl_ui_layout_part_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Box_Data *pd)
 {
@@ -221,15 +221,6 @@ _efl_ui_layout_part_box_efl_ui_layout_orientable_orientation_get(const Eo *obj E
 /* Table proxy implementation */
 
 EOLIAN static void
-_efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
-{
-   pd->obj = layout;
-   pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_BASE_CLASS, obj);
-   eina_stringshare_replace(&pd->part, part);
-   pd->temp = 1;
-}
-
-EOLIAN static void
 _efl_ui_layout_part_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
 {
    ELM_PART_HOOK;

diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 8284e3d..8aa664e 100644 (file)
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -13,15 +13,6 @@ class @beta Efl.Ui.Layout_Part_Box extends Efl.Ui.Layout_Part implements Efl.Pac
    ]]
    data: Efl_Ui_Layout_Box_Data;
    methods {
-      /* FIXME: Remove this. */
-      @property real_part @protected {
-          [[Real part property]]
-         set {}
-         values {
-            layout: Efl.Object; [[Real part object]]
-            part: string; [[Real part name]]
-         }
-      }
    }
    implements {
       Efl.Object.destructor;

diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index ddf8a4b..20469e6 100644 (file)
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -11,15 +11,6 @@ class @beta Efl.Ui.Layout_Part_Table extends Efl.Ui.Layout_Part implements Efl.P
    ]]
    data: Efl_Ui_Layout_Table_Data;
    methods {
-      /* FIXME: Remove this. */
-      @property real_part @protected {
-          [[Real part property]]
-         set {}
-         values {
-            layout: Efl.Object; [[Real part object]]
-            part: string; [[Real part name]]
-         }
-      }
    }
    implements {
       Efl.Object.destructor;