bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=530d03dcf662d2b6159475ba60e2f8a3263a0bc4
commit 530d03dcf662d2b6159475ba60e2f8a3263a0bc4
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Wed Jul 24 15:59:24 2019 +0200
efl_ui_list_item: remove this
this has nothing usefull in it. Additionally, future commits will brings
up another design where there is a central default item style, which can
be hinted.
Reviewed-by: Cedric BAIL <cedric.b...@free.fr>
Differential Revision: https://phab.enlightenment.org/D9394
---
src/examples/elementary/efl_ui_list_example_1.c | 10 +--
src/lib/elementary/Efl_Ui.h | 1 -
src/lib/elementary/Elementary.h | 1 -
src/lib/elementary/efl_ui_list.c | 1 -
src/lib/elementary/efl_ui_list.eo | 2 -
src/lib/elementary/efl_ui_list_default_item.eo | 2 +-
src/lib/elementary/efl_ui_list_item.c | 83 ----------------------
src/lib/elementary/efl_ui_list_item.eo | 12 ----
src/lib/elementary/efl_ui_list_item_private.h | 30 --------
src/lib/elementary/efl_ui_list_placeholder_item.eo | 2 +-
src/lib/elementary/meson.build | 3 -
11 files changed, 7 insertions(+), 140 deletions(-)
diff --git a/src/examples/elementary/efl_ui_list_example_1.c
b/src/examples/elementary/efl_ui_list_example_1.c
index dcb434fcf1..a7be7937df 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -30,7 +30,7 @@ _list_selected(void *data EINA_UNUSED, const Efl_Event *ev)
Eo *item = ev->info, *tmp;
printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item),
(efl_ui_item_selected_get(item)? "selected" : "unselected"));
- Eina_Iterator *selects = efl_ui_item_container_selected_items_get(list);
+ Eina_Iterator *selects = efl_ui_collection_selected_items_get(list);
EINA_ITERATOR_FOREACH(selects, tmp)
printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp));
@@ -82,18 +82,18 @@ _anim_radio_changed(void *data, const Efl_Event *ev
EINA_UNUSED)
static void
_scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
- Efl_Ui_List_Item *item =
efl_ui_item_container_last_selected_item_get(priv_d.list);
+ Efl_Ui_List_Default_Item *item =
efl_ui_collection_last_selected_item_get(priv_d.list);
printf("show [%d:%p] [%d]\n", efl_ui_item_index_get(item), item,
priv_d.anim);
- efl_ui_item_container_item_scroll(priv_d.list, item, priv_d.anim);
+ efl_ui_collection_item_scroll(priv_d.list, item, priv_d.anim);
}
static void
_scrl_align_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev
EINA_UNUSED)
{
- Efl_Ui_List_Item *item =
efl_ui_item_container_last_selected_item_get(priv_d.list);
+ Efl_Ui_List_Default_Item *item =
efl_ui_collection_last_selected_item_get(priv_d.list);
double align = efl_ui_range_value_get(priv_d.slider);
printf("show [%d:%p] [%.2lf], [%d]\n", efl_ui_item_index_get(item), item,
align, priv_d.anim);
- efl_ui_item_container_item_scroll_align(priv_d.list, item, align,
priv_d.anim);
+ efl_ui_collection_item_scroll_align(priv_d.list, item, align, priv_d.anim);
}
EAPI_MAIN int
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 7d16959036..4ec35d0499 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -255,7 +255,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
# include <efl_ui_item_container.eo.h>
# include <efl_ui_position_manager_list.eo.h>
# include <efl_ui_position_manager_grid.eo.h>
-# include <efl_ui_list_item.eo.h>
# include <efl_ui_list_default_item.eo.h>
# include <efl_ui_grid_item.eo.h>
# include <efl_ui_grid_default_item.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 3316529acc..ba10773ff4 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -334,7 +334,6 @@ typedef Eo Efl_Ui_Focus_Manager;
# include <efl_ui_item_part_extra.eo.h>
# include <efl_ui_item_part_content.eo.h>
# include <efl_ui_item.eo.h>
-# include <efl_ui_list_item.eo.h>
# include <efl_ui_list_default_item.eo.h>
# include <efl_ui_list_placeholder_item.eo.h>
# include <efl_ui_list.eo.h>
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 8d8cbc25f8..eb842e137a 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -8,7 +8,6 @@
#include <Efl_Ui.h>
#include "elm_priv.h"
-#include "efl_ui_list_item_private.h"
#include "efl_ui_item_private.h"
#define MY_CLASS EFL_UI_LIST_CLASS
diff --git a/src/lib/elementary/efl_ui_list.eo
b/src/lib/elementary/efl_ui_list.eo
index cf99aad862..6254e16a18 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,5 +1,3 @@
-import efl_ui_list_item;
-
class @beta Efl.Ui.List extends Efl.Ui.Item_Container
{
[[Simple list widget with Pack interface.]]
diff --git a/src/lib/elementary/efl_ui_list_default_item.eo
b/src/lib/elementary/efl_ui_list_default_item.eo
index ee4e770f5d..90cc024b97 100644
--- a/src/lib/elementary/efl_ui_list_default_item.eo
+++ b/src/lib/elementary/efl_ui_list_default_item.eo
@@ -1,5 +1,5 @@
-class @beta Efl.Ui.List_Default_Item extends Efl.Ui.List_Item implements
+class @beta Efl.Ui.List_Default_Item extends Efl.Ui.Item implements
Efl.Text,
Efl.Text_Markup,
Efl.Content
diff --git a/src/lib/elementary/efl_ui_list_item.c
b/src/lib/elementary/efl_ui_list_item.c
deleted file mode 100644
index 1fe67e9c0c..0000000000
--- a/src/lib/elementary/efl_ui_list_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 <Elementary.h>
-
-#include "elm_priv.h"
-#include "efl_ui_list_item_private.h"
-
-#define MY_CLASS EFL_UI_LIST_ITEM_CLASS
-#define MY_CLASS_PFX efl_ui_list_item
-
-#define MY_CLASS_NAME "Efl.Ui.List_Item"
-
-static void
-_sizing_eval(Evas_Object *obj, Efl_Ui_List_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_list_item_elm_layout_sizing_eval(Eo *obj, Efl_Ui_List_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_list_item_efl_canvas_group_group_calculate(Eo *obj,
Efl_Ui_List_Item_Data *pd)
-{
- if (pd->needs_size_calc)
- {
- _sizing_eval(obj, pd);
- pd->needs_size_calc = EINA_FALSE;
- }
-}
-
-EOLIAN static Eo *
-_efl_ui_list_item_efl_object_constructor(Eo *obj, Efl_Ui_List_Item_Data *pd)
-{
- pd->obj = obj;
- obj = efl_constructor(efl_super(obj, MY_CLASS));
-
- return obj;
-}
-
-EOLIAN static Efl_Object *
-_efl_ui_list_item_efl_object_finalize(Eo *obj, Efl_Ui_List_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_list_item_efl_object_destructor(Eo *obj, Efl_Ui_List_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_LIST_ITEM_EXTRA_OPS \
- ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_list_item)
-
-#include "efl_ui_list_item.eo.c"
diff --git a/src/lib/elementary/efl_ui_list_item.eo
b/src/lib/elementary/efl_ui_list_item.eo
deleted file mode 100644
index 2997926cfd..0000000000
--- a/src/lib/elementary/efl_ui_list_item.eo
+++ /dev/null
@@ -1,12 +0,0 @@
-
-abstract @beta Efl.Ui.List_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_list_item_private.h
b/src/lib/elementary/efl_ui_list_item_private.h
deleted file mode 100644
index 0df36bc459..0000000000
--- a/src/lib/elementary/efl_ui_list_item_private.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef EFL_UI_LIST_ITEM_PRIVATE_H
-#define EFL_UI_LIST_ITEM_PRIVATE_H
-
-#include "Elementary.h"
-
-typedef struct _Efl_Ui_List_Item_Data
-{
- // Eo Objects
- Eo *obj; /* Self-Object */
- Eina_Bool needs_size_calc : 1; /* Flag for Size calculation */
-} Efl_Ui_List_Item_Data;
-
-
-#define EFL_UI_LIST_ITEM_DATA_GET(o, pd) \
- Efl_Ui_List_Item_Data * pd = efl_data_scope_safe_get(o,
EFL_UI_LIST_ITEM_CLASS)
-
-#define EFL_UI_LIST_ITEM_DATA_GET_OR_RETURN(o, ptr, ...) \
- EFL_UI_LIST_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_LIST_ITEM_CHECK_OR_RETURN(obj, ...) \
- if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_LIST_ITEM_CLASS))) \
- return __VA_ARGS__;
-
-#endif
diff --git a/src/lib/elementary/efl_ui_list_placeholder_item.eo
b/src/lib/elementary/efl_ui_list_placeholder_item.eo
index e9dbcab477..83a0f9954e 100644
--- a/src/lib/elementary/efl_ui_list_placeholder_item.eo
+++ b/src/lib/elementary/efl_ui_list_placeholder_item.eo
@@ -1,5 +1,5 @@
-class @beta Efl.Ui.List_Placeholder_Item extends Efl.Ui.List_Item implements
Efl.Content
+class @beta Efl.Ui.List_Placeholder_Item extends Efl.Ui.Item implements
Efl.Content
{
[[List Placeholder Item class. This item have only one swallow space,
thus user can decorate item by filling the swallow with
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index e3bc6024f0..9d2bb71ae8 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -121,7 +121,6 @@ pub_eo_files = [
'efl_ui_item_part_extra.eo',
'efl_ui_item_part_content.eo',
'efl_ui_item.eo',
- 'efl_ui_list_item.eo',
'efl_ui_list_default_item.eo',
'efl_ui_list_placeholder_item.eo',
'efl_ui_list.eo',
@@ -354,7 +353,6 @@ elementary_headers_unstable = [
'elm_widget_toolbar.h',
'efl_ui_video_private.h',
'efl_ui_item_private.h',
- 'efl_ui_list_item_private.h',
'efl_ui_grid_item_private.h',
'efl_ui_list_view_private.h',
'efl_ui_list_view_seg_array.h',
@@ -895,7 +893,6 @@ elementary_src = [
'efl_ui_focus_util.c',
'elm_widget_item_static_focus.c',
'efl_ui_item.c',
- 'efl_ui_list_item.c',
'efl_ui_list_default_item.c',
'efl_ui_list_placeholder_item.c',
'efl_ui_list.c',
--
