From: James Westman <james@jwestman.net>
Date: Mon, 2 Aug 2021 21:38:11 +0000 (-0500)
Subject: gtkgesturerotate: Fix assertion
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~1^2~42^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb0229890bc4ff2d78185227a4448860eaec8d38;p=gtk4.git

gtkgesturerotate: Fix assertion

Fixes #4144. An assertion would be printed when GtkGestureRotate was
used with a touchscreen.
---

diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index 873302c422..5ecf7490b1 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -95,13 +95,13 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate,
     goto out;
 
   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 &&
-      (phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
-       phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
-       phase == GDK_TOUCHPAD_GESTURE_PHASE_END))
+  if (gdk_event_get_event_type (last_event) == GDK_TOUCHPAD_PINCH)
     {
+      phase = gdk_touchpad_event_get_gesture_phase (last_event);
+      if (phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL)
+        goto out;
+
       *angle = priv->accum_touchpad_angle;
     }
   else