isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

gesture-action: Prepare for clutter_gesture_action_cancel() within ::gesture-end

Browse Source 
There may be odd situations where full gesture cancellation may be wanted at once
when the first touch is lifted and ::gesture-end is emitted on a gesture action.
Although calling clutter_gesture_action_cancel() within the ::gesture-end handler
causes 2 critical warnings that are otherwise harmless.

https://bugzilla.gnome.org/show_bug.cgi?id=732907
This commit is contained in:
Carlos Garnacho 2014-07-08 18:20:26 +02:00
parent ec911dc8b9
commit 8d669ab8ce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,9 @@ gesture_unregister_point (ClutterGestureAction *action, gint position)
{ {
ClutterGestureActionPrivate *priv = action->priv; ClutterGestureActionPrivate *priv = action->priv;
if (action->priv->points->len == 0)
return;
g_array_remove_index (priv->points, position); g_array_remove_index (priv->points, position);
} }
@ -480,7 +483,7 @@ stage_captured_event_cb (ClutterActor *stage,
break; break;
} }
if (priv->points->len == 0) if (priv->points->len == 0 && priv->stage_capture_id)
{ {
g_signal_handler_disconnect (priv->stage, priv->stage_capture_id); g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
priv->stage_capture_id = 0; priv->stage_capture_id = 0;