hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marcel Hollerbach 2019-09-17 16:39:55 +02:00 committed by Cedric Bail
parent aecb3a4bb2
commit d8053bac96
3 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/elementary/efl_ui_layout_pack.c
View File

@ -41,15 +41,24 @@ 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)
{
if (type == EDJE_PART_TYPE_BOX)
return efl_add(BOX_CLASS, obj,
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,
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;
}
@ -63,15 +72,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)
{
@ -214,15 +214,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)
{

9
src/lib/elementary/efl_ui_layout_part_box.eo
View File

@ -8,15 +8,6 @@ class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear
]]
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;

9
src/lib/elementary/efl_ui_layout_part_table.eo
View File

@ -7,15 +7,6 @@ class @beta Efl.Ui.Layout_Part_Table extends Efl.Object implements Efl.Pack_Tabl
]]
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;