Verified Commit fb022989 authored by James Westman's avatar James Westman
Browse files

gtkgesturerotate: Fix assertion

Fixes #4144. An assertion would be printed when GtkGestureRotate was
used with a touchscreen.
parent f59d2ae8
...@@ -95,13 +95,13 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate, ...@@ -95,13 +95,13 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate,
goto out; goto out;
last_event = gtk_gesture_get_last_event (gesture, sequences->data); last_event = gtk_gesture_get_last_event (gesture, sequences->data);
phase = gdk_touchpad_event_get_gesture_phase (last_event);
if (gdk_event_get_event_type (last_event) == GDK_TOUCHPAD_PINCH && if (gdk_event_get_event_type (last_event) == GDK_TOUCHPAD_PINCH)
(phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
phase == GDK_TOUCHPAD_GESTURE_PHASE_END))
{ {
phase = gdk_touchpad_event_get_gesture_phase (last_event);
if (phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL)
goto out;
*angle = priv->accum_touchpad_angle; *angle = priv->accum_touchpad_angle;
} }
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment