bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f00ae98a1dc1926f06f785d7e9c28996c92a326d
commit f00ae98a1dc1926f06f785d7e9c28996c92a326d Author: Marcel Hollerbach <[email protected]> Date: Thu Jan 24 10:20:23 2019 +0100 elm: add container api for the two objects this resolves unimplemented API by just mirroring the calls to different API calls. ref T5719 Reviewed-by: Cedric BAIL <[email protected]> Differential Revision: https://phab.enlightenment.org/D7749 --- src/lib/elementary/efl_ui_box.c | 8 ++++++++ src/lib/elementary/efl_ui_box.eo | 2 +- src/lib/elementary/efl_ui_table.c | 7 +++++++ src/lib/elementary/efl_ui_table.eo | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 3abf465a1a..aa6b2d85aa 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -181,6 +181,14 @@ _efl_ui_box_efl_container_content_count(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED return bd ? eina_list_count(bd->children) : 0; } +EOLIAN static Eina_Bool +_efl_ui_box_efl_container_content_remove(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *content) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); + + return evas_object_box_remove(wd->resize_obj, content); +} + EOLIAN static Eina_Bool _efl_ui_box_efl_pack_pack_clear(Eo *obj, Efl_Ui_Box_Data *pd) { diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index 76a546b5eb..3b595096ef 100644 --- a/src/lib/elementary/efl_ui_box.eo +++ b/src/lib/elementary/efl_ui_box.eo @@ -18,7 +18,7 @@ class Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layo implements { Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - //Efl.Container.content_remove; // TODO + Efl.Container.content_remove; Efl.Container.content_iterate; Efl.Container.content_count; Efl.Ui.Direction.direction { get; set; } diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c index d3415d75e4..5e7ccbda98 100644 --- a/src/lib/elementary/efl_ui_table.c +++ b/src/lib/elementary/efl_ui_table.c @@ -523,6 +523,13 @@ _efl_ui_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Table_Data return pd->count; } +EOLIAN static Eina_Bool +_efl_ui_table_efl_container_content_remove(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx_Entity *content) +{ + return efl_pack_unpack(obj, content); +} + + EOLIAN static Eina_Iterator * _efl_ui_table_efl_pack_table_table_contents_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, int col, int row, Eina_Bool below) diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo index 35774f30b5..a1b7f45e87 100644 --- a/src/lib/elementary/efl_ui_table.eo +++ b/src/lib/elementary/efl_ui_table.eo @@ -6,7 +6,7 @@ class Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Lay Efl.Object.constructor; Efl.Canvas.Group.group_calculate; Efl.Ui.Widget.theme_apply; - //Efl.Container.content_remove; // TODO + Efl.Container.content_remove; Efl.Container.content_iterate; Efl.Container.content_count; Efl.Ui.Direction.direction { get; set; } --
