aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-11-15 10:52:16 +0200
committerDaniel Hirt <hirt.danny@gmail.com>2018-11-15 10:59:41 +0200
commitd552c670d9fa4a5e650cc3984f0a5b6138d46a7e (patch)
tree43c72648d1d46a5a267ff7f0499938f3bb28d96a
parentUi text: remove unused code from internal scroller (diff)
downloadefl-d552c670d9fa4a5e650cc3984f0a5b6138d46a7e.tar.gz
Scroll manager: remove unnecessary callback_del
Child objects are already destoryed during destruction of the parent object. This fixes ERR messages when doing operations on the `event_rect` object, which is already destroyed at that point.
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 21d2c032de..4448f0cdb3 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -1948,25 +1948,6 @@ _scroll_event_object_attach(Evas_Object *obj)
}
static void
-_scroll_event_object_detach(Evas_Object *obj)
-{
- EFL_UI_SCROLL_MANAGER_DATA_GET_OR_RETURN(obj, sd);
-
- evas_object_event_callback_del_full
- (sd->event_rect, EVAS_CALLBACK_MOUSE_WHEEL, _efl_ui_scroll_manager_wheel_event_cb,
- sd);
- evas_object_event_callback_del_full
- (sd->event_rect, EVAS_CALLBACK_MOUSE_DOWN,
- _efl_ui_scroll_manager_mouse_down_event_cb, sd);
- evas_object_event_callback_del_full
- (sd->event_rect, EVAS_CALLBACK_MOUSE_UP,
- _efl_ui_scroll_manager_mouse_up_event_cb, sd);
- evas_object_event_callback_del_full
- (sd->event_rect, EVAS_CALLBACK_MOUSE_MOVE,
- _efl_ui_scroll_manager_mouse_move_event_cb, sd);
-}
-
-static void
_efl_ui_scroll_manager_pan_content_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
Efl_Ui_Scroll_Manager_Data *sd = data;
@@ -2463,8 +2444,6 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data
efl_event_callback_del
(sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
- _scroll_event_object_detach(obj);
-
efl_destructor(efl_super(obj, MY_CLASS));
}