diff --git a/clutter/clutter-pan-action.c b/clutter/clutter-pan-action.c index 14188be07..63c311874 100644 --- a/clutter/clutter-pan-action.c +++ b/clutter/clutter-pan-action.c @@ -61,6 +61,7 @@ #include "clutter-debug.h" #include "clutter-enum-types.h" +#include "clutter-gesture-action-private.h" #include "clutter-marshal.h" #include "clutter-private.h" #include @@ -556,10 +557,15 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass) static void clutter_pan_action_init (ClutterPanAction *self) { + ClutterGestureAction *gesture; + self->priv = clutter_pan_action_get_instance_private (self); self->priv->deceleration_rate = default_deceleration_rate; self->priv->acceleration_factor = default_acceleration_factor; self->priv->state = PAN_STATE_INACTIVE; + + gesture = CLUTTER_GESTURE_ACTION (self); + clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_AFTER); } /** diff --git a/clutter/clutter-rotate-action.c b/clutter/clutter-rotate-action.c index 7c155f0e7..d46d4ffef 100644 --- a/clutter/clutter-rotate-action.c +++ b/clutter/clutter-rotate-action.c @@ -43,6 +43,7 @@ #include "clutter-debug.h" #include "clutter-enum-types.h" +#include "clutter-gesture-action-private.h" #include "clutter-marshal.h" #include "clutter-private.h" @@ -214,9 +215,13 @@ clutter_rotate_action_class_init (ClutterRotateActionClass *klass) static void clutter_rotate_action_init (ClutterRotateAction *self) { + ClutterGestureAction *gesture; + self->priv = clutter_rotate_action_get_instance_private (self); - clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2); + gesture = CLUTTER_GESTURE_ACTION (self); + clutter_gesture_action_set_n_touch_points (gesture, 2); + clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_NONE); } /** diff --git a/clutter/clutter-swipe-action.c b/clutter/clutter-swipe-action.c index 96b7c091c..da1aab3d6 100644 --- a/clutter/clutter-swipe-action.c +++ b/clutter/clutter-swipe-action.c @@ -45,6 +45,7 @@ #include "clutter-debug.h" #include "clutter-enum-types.h" +#include "clutter-gesture-action-private.h" #include "clutter-marshal.h" #include "clutter-private.h" @@ -245,6 +246,9 @@ static void clutter_swipe_action_init (ClutterSwipeAction *self) { self->priv = clutter_swipe_action_get_instance_private (self); + + clutter_gesture_action_set_threshold_trigger_edge (CLUTTER_GESTURE_ACTION (self), + CLUTTER_GESTURE_TRIGGER_EDGE_AFTER); } /** diff --git a/clutter/clutter-zoom-action.c b/clutter/clutter-zoom-action.c index 3f4eb9a9f..36d2de0b1 100644 --- a/clutter/clutter-zoom-action.c +++ b/clutter/clutter-zoom-action.c @@ -56,6 +56,7 @@ #include "clutter-debug.h" #include "clutter-enum-types.h" +#include "clutter-gesture-action-private.h" #include "clutter-marshal.h" #include "clutter-private.h" #include "clutter-stage-private.h" @@ -398,10 +399,14 @@ clutter_zoom_action_class_init (ClutterZoomActionClass *klass) static void clutter_zoom_action_init (ClutterZoomAction *self) { + ClutterGestureAction *gesture; + self->priv = clutter_zoom_action_get_instance_private (self); self->priv->zoom_axis = CLUTTER_ZOOM_BOTH; - clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2); + gesture = CLUTTER_GESTURE_ACTION (self); + clutter_gesture_action_set_n_touch_points (gesture, 2); + clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_NONE); } /**