felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=71d339579cb8fbbc1881dd3c30cc8e6ccde809f3
commit 71d339579cb8fbbc1881dd3c30cc8e6ccde809f3
Author: Felipe Magno de Almeida <fel...@expertisesolutions.com.br>
Date: Wed Aug 1 19:45:36 2018 -0300
elementary: efl_ui_view_list cleanup
Summary:
private data cleanup
removed callbacks
Reviewers: felipealmeida, SanghyeonLee
Reviewed By: felipealmeida
Subscribers: Hermet
Differential Revision: https://phab.enlightenment.org/D6707
---
src/lib/elementary/efl_ui_view_list.c | 27 +++++-----------------
src/lib/elementary/efl_ui_view_list_private.h | 32 +++------------------------
2 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/src/lib/elementary/efl_ui_view_list.c
b/src/lib/elementary/efl_ui_view_list.c
index ca31058401..08c8604e82 100644
--- a/src/lib/elementary/efl_ui_view_list.c
+++ b/src/lib/elementary/efl_ui_view_list.c
@@ -2,13 +2,10 @@
# include "elementary_config.h"
#endif
#define EFL_ACCESS_OBJECT_PROTECTED
-#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define EFL_UI_SCROLL_MANAGER_PROTECTED
#define EFL_UI_SCROLLBAR_PROTECTED
#define EFL_UI_SCROLLBAR_BETA
-#define EFL_GFX_SIZE_HINT_PROTECTED
-#define EFL_UI_VIEW_LIST_PROTECTED
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
#define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
@@ -400,12 +397,6 @@ _efl_ui_view_list_hbar_unpress_cb(void *data,
}
static void
-_scroll_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
-{
- //scroll cb
-}
-
-static void
_efl_ui_view_list_bar_size_changed_cb(void *data, const Efl_Event *event
EINA_UNUSED)
{
Eo *obj = data;
@@ -490,8 +481,8 @@ _efl_ui_view_list_edje_object_attach(Eo *obj)
(obj, "reload", "efl", _efl_ui_view_list_reload_cb, obj);
//Vertical bar
efl_layout_signal_callback_add
- (obj, "drag", "efl.dragable.vbar", _efl_ui_view_list_vbar_drag_cb,
- obj);
+ (obj, "drag", "efl.dragable.vbar",
+ _efl_ui_view_list_vbar_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "drag,set", "efl.dragable.vbar",
_efl_ui_view_list_edje_drag_cb, obj);
@@ -516,8 +507,8 @@ _efl_ui_view_list_edje_object_attach(Eo *obj)
//Horizontal bar
efl_layout_signal_callback_add
- (obj, "drag", "efl.dragable.hbar", _efl_ui_view_list_hbar_drag_cb,
- obj);
+ (obj, "drag", "efl.dragable.hbar",
+ _efl_ui_view_list_hbar_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "drag,set", "efl.dragable.hbar",
_efl_ui_view_list_edje_drag_cb, obj);
@@ -574,8 +565,8 @@ _efl_ui_view_list_edje_object_detach(Evas_Object *obj)
//Horizontal bar
efl_layout_signal_callback_del
- (obj, "drag", "efl.dragable.hbar", _efl_ui_view_list_hbar_drag_cb,
- obj);
+ (obj, "drag", "efl.dragable.hbar",
+ _efl_ui_view_list_hbar_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "drag,set", "efl.dragable.hbar",
_efl_ui_view_list_edje_drag_cb, obj);
@@ -632,16 +623,12 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj,
Efl_Ui_View_List_Data *pd)
edje_object_thaw(wd->resize_obj);
efl_gfx_stack_raise((Eo *)o);
- pd->mode = ELM_LIST_COMPRESS;
-
efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE);
-
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h);
efl_gfx_size_hint_restricted_min_set(obj, min);
- efl_event_callback_add(obj, EFL_UI_EVENT_SCROLL, _scroll_cb, obj);
efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_SIZE_CHANGED,
_efl_ui_view_list_bar_size_changed_cb, obj);
efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_POS_CHANGED,
@@ -708,7 +695,6 @@ _efl_ui_view_list_efl_object_constructor(Eo *obj,
Efl_Ui_View_List_Data *pd)
pd->style = eina_stringshare_add(elm_widget_style_get(obj));
pd->factory = NULL;
- pd->orient = EFL_ORIENT_DOWN;
pd->min.w = 0;
pd->min.h = 0;
@@ -723,7 +709,6 @@ _efl_ui_view_list_efl_object_destructor(Eo *obj,
Efl_Ui_View_List_Data *pd)
efl_unref(pd->model);
eina_stringshare_del(pd->style);
- efl_event_callback_del(obj, EFL_UI_EVENT_SCROLL, _scroll_cb, obj);
_efl_ui_view_list_edje_object_detach(obj);
ELM_SAFE_FREE(pd->pan_obj, evas_object_del);
diff --git a/src/lib/elementary/efl_ui_view_list_private.h
b/src/lib/elementary/efl_ui_view_list_private.h
index 7560870f14..94c5d894a8 100644
--- a/src/lib/elementary/efl_ui_view_list_private.h
+++ b/src/lib/elementary/efl_ui_view_list_private.h
@@ -5,26 +5,19 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
-#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
-
#include <Elementary.h>
#include "elm_priv.h"
typedef struct _Efl_Ui_View_List_Data Efl_Ui_View_List_Data;
-
int efl_ui_view_list_item_index_get(Efl_Ui_View_List_LayoutItem *item);
-typedef struct _Efl_Ui_View_List_Data Efl_Ui_View_List_Data;
-
#include "efl_ui_view_list_segarray.h"
struct _Efl_Ui_View_List_Data
{
Eo *obj;
Eo *scrl_mgr;
- Efl_Ui_View_List_Pan *pan_obj;
+ Efl_Ui_View_List_Pan *pan_obj;
Efl_Model *model;
Eina_Stringshare *style;
@@ -41,21 +34,13 @@ struct _Efl_Ui_View_List_Data
Efl_Ui_Focus_Manager *manager;
Efl_Ui_View_List_Relayout *relayout;
-
- Efl_Orient orient;
-
- int segarray_first;
- Efl_Ui_View_List_SegArray *segarray;
+ Efl_Ui_View_List_SegArray *segarray;
+ int segarray_first;
Elm_Object_Select_Mode select_mode;
- Elm_List_Mode mode;
-
- Eina_Rect gmt;
Eina_Size2D min;
Eina_Bool homogeneous : 1;
- Eina_Bool recalc : 1;
- Eina_Bool on_hold : 1;
Eina_Bool scrl_freeze : 1;
};
@@ -65,17 +50,6 @@ struct _Efl_Ui_View_List_Pan_Data
{
Eo *wobj;
Eina_Rect gmt;
- Evas_Coord move_diff;
-
- Ecore_Job *resize_job;
-};
-
-typedef struct _Efl_Ui_View_List_Slice Efl_Ui_View_List_Slice;
-
-struct _Efl_Ui_View_List_Slice
-{
- Efl_Ui_View_List_Data *pd;
- int newstart, slicestart, newslice;
};
#define EFL_UI_VIEW_LIST_DATA_GET(o, ptr) \
--
