From 167d2475e8f879e96d80fa4a03eb3ab06098bfe5 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 24 Jul 2019 16:36:17 +0200 Subject: [PATCH] efl_ui_grid_item: remove this this is not needed anymore, the grid items can also just inherit directly from the items. Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D9395 --- src/lib/elementary/Efl_Ui.h | 1 - src/lib/elementary/Elementary.h | 1 - src/lib/elementary/efl_ui_grid.c | 1 - src/lib/elementary/efl_ui_grid.eo | 2 - .../elementary/efl_ui_grid_default_item.eo | 2 +- src/lib/elementary/efl_ui_grid_item.c | 83 ------------------- src/lib/elementary/efl_ui_grid_item.eo | 12 --- src/lib/elementary/efl_ui_grid_item_private.h | 40 --------- src/lib/elementary/meson.build | 3 - src/tests/elementary/efl_ui_test_grid.c | 20 ++--- 10 files changed, 11 insertions(+), 154 deletions(-) delete mode 100644 src/lib/elementary/efl_ui_grid_item.c delete mode 100644 src/lib/elementary/efl_ui_grid_item.eo delete mode 100644 src/lib/elementary/efl_ui_grid_item_private.h diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index 4ec35d0499..0cf1d0fb5d 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -256,7 +256,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include # include -# include # include /** diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index ba10773ff4..6faf7f7ac5 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -337,7 +337,6 @@ typedef Eo Efl_Ui_Focus_Manager; # include # include # include -# include # include # include # include diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 331b435b68..a82c0a77dd 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -9,7 +9,6 @@ #include #include "elm_priv.h" #include "efl_ui_item_private.h" -#include "efl_ui_grid_item_private.h" #define MY_CLASS EFL_UI_GRID_CLASS #define MY_CLASS_PFX efl_ui_grid diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo index ce4fbd6a29..5ae359b727 100644 --- a/src/lib/elementary/efl_ui_grid.eo +++ b/src/lib/elementary/efl_ui_grid.eo @@ -1,5 +1,3 @@ -import efl_ui_grid_item; - class @beta Efl.Ui.Grid extends Efl.Ui.Item_Container { [[Simple grid widget with Pack interface.]] diff --git a/src/lib/elementary/efl_ui_grid_default_item.eo b/src/lib/elementary/efl_ui_grid_default_item.eo index 9b3a0eb890..90461b0b6e 100644 --- a/src/lib/elementary/efl_ui_grid_default_item.eo +++ b/src/lib/elementary/efl_ui_grid_default_item.eo @@ -1,5 +1,5 @@ -class @beta Efl.Ui.Grid_Default_Item extends Efl.Ui.Grid_Item implements +class @beta Efl.Ui.Grid_Default_Item extends Efl.Ui.Item implements Efl.Text, Efl.Text_Markup, Efl.Ui.L10n, diff --git a/src/lib/elementary/efl_ui_grid_item.c b/src/lib/elementary/efl_ui_grid_item.c deleted file mode 100644 index 29daea7896..0000000000 --- a/src/lib/elementary/efl_ui_grid_item.c +++ /dev/null @@ -1,83 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include "elementary_config.h" -#endif - -#define EFL_ACCESS_PROTECTED -#define EFL_UI_WIDGET_PART_BG_PROTECTED - -#include - -#include "elm_priv.h" -#include "efl_ui_grid_item_private.h" - -#define MY_CLASS EFL_UI_GRID_ITEM_CLASS -#define MY_CLASS_PFX efl_ui_grid_item - -#define MY_CLASS_NAME "Efl.Ui.Grid_Item" - -static void -_sizing_eval(Evas_Object *obj, Efl_Ui_Grid_Item_Data *pd) -{ - Evas_Coord minh = -1, minw = -1; - Evas_Coord rest_w = 0, rest_h = 0; - ELM_WIDGET_DATA_GET_OR_RETURN(pd->obj, wd); - - edje_object_size_min_restricted_calc(wd->resize_obj, &minw, &minh, - rest_w, rest_h); - evas_object_size_hint_min_set(obj, minw, minh); - - pd->needs_size_calc = EINA_FALSE; -} - -static void -_efl_ui_grid_item_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Grid_Item_Data *pd) -{ - if (pd->needs_size_calc) return; - pd->needs_size_calc = EINA_TRUE; - - efl_canvas_group_change(obj); -} - -EOLIAN static void -_efl_ui_grid_item_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Grid_Item_Data *pd) -{ - if (pd->needs_size_calc) - { - _sizing_eval(obj, pd); - pd->needs_size_calc = EINA_FALSE; - } -} - -EOLIAN static Eo * -_efl_ui_grid_item_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Item_Data *pd) -{ - pd->obj = obj; - obj = efl_constructor(efl_super(obj, MY_CLASS)); - - return obj; -} - -EOLIAN static Efl_Object * -_efl_ui_grid_item_efl_object_finalize(Eo *obj, Efl_Ui_Grid_Item_Data *pd EINA_UNUSED) -{ - Eo *eo; - eo = efl_finalize(efl_super(obj, MY_CLASS)); - ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); - - return eo; -} - -EOLIAN static void -_efl_ui_grid_item_efl_object_destructor(Eo *obj, Efl_Ui_Grid_Item_Data *pd EINA_UNUSED) -{ - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - - efl_destructor(efl_super(obj, MY_CLASS)); -} - -/* Internal EO APIs and hidden overrides */ - -#define EFL_UI_GRID_ITEM_EXTRA_OPS \ - ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_grid_item) - -#include "efl_ui_grid_item.eo.c" diff --git a/src/lib/elementary/efl_ui_grid_item.eo b/src/lib/elementary/efl_ui_grid_item.eo deleted file mode 100644 index 99a4abca01..0000000000 --- a/src/lib/elementary/efl_ui_grid_item.eo +++ /dev/null @@ -1,12 +0,0 @@ - -abstract @beta Efl.Ui.Grid_Item extends Efl.Ui.Item -{ - implements { - //Efl.Object - Efl.Object.constructor; - Efl.Object.finalize; - Efl.Object.destructor; - //Efl.Canvas - Efl.Canvas.Group.group_calculate; - } -} diff --git a/src/lib/elementary/efl_ui_grid_item_private.h b/src/lib/elementary/efl_ui_grid_item_private.h deleted file mode 100644 index d8c4009826..0000000000 --- a/src/lib/elementary/efl_ui_grid_item_private.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef EFL_UI_GRID_ITEM_PRIVATE_H -#define EFL_UI_GRID_ITEM_PRIVATE_H - -#include "Elementary.h" - -typedef struct _Efl_Ui_Grid_Item_Data -{ - // Eo Objects - Eo *obj; /* Self-Object */ - Eina_Rect geo; - int index; - struct { - int row; - int col; - } pos; - - /* Boolean Values */ - Eina_Bool needs_size_calc : 1; /* Flag for Size calculation */ - Eina_Bool update_me: 1; - Eina_Bool update_begin: 1; -} Efl_Ui_Grid_Item_Data; - - -#define EFL_UI_GRID_ITEM_DATA_GET(o, pd) \ - Efl_Ui_Grid_Item_Data * pd = efl_data_scope_safe_get(o, EFL_UI_GRID_ITEM_CLASS) - -#define EFL_UI_GRID_ITEM_DATA_GET_OR_RETURN(o, ptr, ...) \ - EFL_UI_GRID_ITEM_DATA_GET(o, ptr); \ - if (EINA_UNLIKELY(!ptr)) \ - { \ - ERR("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return __VA_ARGS__; \ - } - -#define EFL_UI_GRID_ITEM_CHECK_OR_RETURN(obj, ...) \ - if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_GRID_ITEM_CLASS))) \ - return __VA_ARGS__; - -#endif diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 9d2bb71ae8..07d85244a1 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -124,7 +124,6 @@ pub_eo_files = [ 'efl_ui_list_default_item.eo', 'efl_ui_list_placeholder_item.eo', 'efl_ui_list.eo', - 'efl_ui_grid_item.eo', 'efl_ui_grid_default_item.eo', 'efl_ui_grid.eo', 'efl_ui_panes_part.eo', @@ -353,7 +352,6 @@ elementary_headers_unstable = [ 'elm_widget_toolbar.h', 'efl_ui_video_private.h', 'efl_ui_item_private.h', - 'efl_ui_grid_item_private.h', 'efl_ui_list_view_private.h', 'efl_ui_list_view_seg_array.h', 'elm_widget_web.h', @@ -896,7 +894,6 @@ elementary_src = [ 'efl_ui_list_default_item.c', 'efl_ui_list_placeholder_item.c', 'efl_ui_list.c', - 'efl_ui_grid_item.c', 'efl_ui_grid_default_item.c', 'efl_ui_grid.c', 'efl_ui_list_view.c', diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c index 1ddf055399..a8d4ea0433 100644 --- a/src/tests/elementary/efl_ui_test_grid.c +++ b/src/tests/elementary/efl_ui_test_grid.c @@ -26,7 +26,7 @@ static Eina_Bool grid_item_pack(Eo *grid, int count, Eina_List **l) { int i; - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; for (i = 0; i < count; i++) { item = efl_add(EFL_UI_GRID_DEFAULT_ITEM_CLASS, grid); @@ -51,7 +51,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_pack) { - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; int count; item = efl_add(EFL_UI_GRID_DEFAULT_ITEM_CLASS, grid); @@ -65,7 +65,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_unpack) { - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; int count; item = efl_add(EFL_UI_GRID_DEFAULT_ITEM_CLASS, grid); @@ -82,7 +82,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_unpack_all) { - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; int count_before = 10; int count; Eina_Iterator *itor; @@ -119,7 +119,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_pack_end) { - Efl_Ui_Grid_Item *item, *compare; + Efl_Ui_Grid_Default_Item *item, *compare; int count_before = 10; int count; @@ -140,7 +140,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_pack_begin) { - Efl_Ui_Grid_Item *item, *compare; + Efl_Ui_Grid_Default_Item *item, *compare; int count_before = 10; int count; @@ -161,7 +161,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_pack_after) { - Efl_Ui_Grid_Item *item, *after, *compare; + Efl_Ui_Grid_Default_Item *item, *after, *compare; int count_before = 10; int count; int index = 5; @@ -186,7 +186,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_pack_before) { - Efl_Ui_Grid_Item *item, *before, *compare; + Efl_Ui_Grid_Default_Item *item, *before, *compare; int count_before = 10; int count; int index = 5; @@ -224,7 +224,7 @@ EFL_END_TEST EFL_START_TEST(efl_ui_grid_content_iterate) { int count = 10; - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; Eina_List *item_list = NULL; Eina_Iterator *item_itr; @@ -276,7 +276,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(grid_scroll_callbacks, EFL_START_TEST(efl_ui_grid_scroll) { - Efl_Ui_Grid_Item *item; + Efl_Ui_Grid_Default_Item *item; Efl_Loop_Timer *timer; ck_assert(grid_item_pack(grid, 100, NULL) != EINA_FALSE);