kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gesture Layer: changed order in cleanup func. 

Changed the order when GLayer is deleted. First we cancel all Gestures,
then we handle any event forwarding.
This commit is contained in:
Aharon Hillel 2013-07-01 18:45:06 +03:00 committed by Daniel Zaoui
parent 13da4a3a80
commit f2b02d0680
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/elementary/src/lib/elm_gesture_layer.c
View File

@ -3719,16 +3719,7 @@ _elm_gesture_layer_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Pointer_Event *data;
int i;
_event_history_clear(obj);
sd->pending = eina_list_free(sd->pending);
EINA_LIST_FREE(sd->touched, data)
free(data);
if (!elm_widget_disabled_get(obj))
_callbacks_unregister(obj);
/* Free all gestures internal data structures */
/* First Free all gestures internal data structures */
for (i = 0; i < ELM_GESTURE_LAST; i++)
if (sd->gesture[i])
{
@ -3740,9 +3731,21 @@ _elm_gesture_layer_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_cbs_clean(sd, i, ELM_GESTURE_STATE_END);
_cbs_clean(sd, i, ELM_GESTURE_STATE_ABORT);
free(sd->gesture[i]);
sd->gesture[i] = NULL; /* Referenced by _event_history_clear */
}
if (sd->gest_taps_timeout) ecore_timer_del(sd->gest_taps_timeout);
/* Then take care of clearing events */
_event_history_clear(obj);
sd->pending = eina_list_free(sd->pending);
EINA_LIST_FREE(sd->touched, data)
free(data);
if (!elm_widget_disabled_get(obj))
_callbacks_unregister(obj);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}