isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

gesture-action: Make _cancel() callable after the gesture has started

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=685554
This commit is contained in:
Emanuele Aina 2012-10-05 12:21:10 +02:00
parent 318d0d5965
commit 1eaa577883
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/clutter-gesture-action.c
View File

@ -292,6 +292,11 @@ stage_captured_event_cb (ClutterActor *stage,
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
} }
/* clutter_gesture_action_cancel() may have been called during
* gesture_prepare(), check that the gesture is still active. */
if (!priv->in_gesture)
return CLUTTER_EVENT_PROPAGATE;
g_signal_emit (action, gesture_signals[GESTURE_BEGIN], 0, actor, g_signal_emit (action, gesture_signals[GESTURE_BEGIN], 0, actor,
&return_value); &return_value);
if (!return_value) if (!return_value)
@ -916,7 +921,6 @@ void
clutter_gesture_action_cancel (ClutterGestureAction *action) clutter_gesture_action_cancel (ClutterGestureAction *action)
{ {
g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action)); g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action));
g_return_if_fail (!action->priv->in_gesture);
cancel_gesture (action); cancel_gesture (action);