summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2013-04-22 14:57:47 -0700
committerLionel Landwerlin <llandwerlin@gmail.com>2013-04-23 17:39:25 +0100
commit1ddef9576d87c98fafbcefe3108f04866630c2cd (patch)
tree32396896f317e4188713c73268a9a566fd37d1cd
parent484672600b98ce1deb1c18592cb201567152ae79 (diff)
downloadclutter-1ddef9576d87c98fafbcefe3108f04866630c2cd.tar.gz
gesture-action: fix trigger edge after behavior with more than 1 point
https://bugzilla.gnome.org/show_bug.cgi?id=698669
-rw-r--r--clutter/clutter-gesture-action.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index 27eb1a597..329b17045 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -448,7 +448,8 @@ actor_captured_event_cb (ClutterActor *actor,
/* Start the gesture immediately if the gesture has no
* _TRIGGER_EDGE_AFTER drag threshold. */
- if (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER)
+ if ((priv->points->len < priv->requested_nb_points) &&
+ (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER))
begin_gesture (action, actor);
return CLUTTER_EVENT_PROPAGATE;