[gtk: 1/2] gtkgesturerotate: Fix assertion
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] gtkgesturerotate: Fix assertion
- Date: Mon, 2 Aug 2021 22:17:22 +0000 (UTC)
commit fb0229890bc4ff2d78185227a4448860eaec8d38
Author: James Westman <james jwestman net>
Date: Mon Aug 2 16:38:11 2021 -0500
gtkgesturerotate: Fix assertion
Fixes #4144. An assertion would be printed when GtkGestureRotate was
used with a touchscreen.
gtk/gtkgesturerotate.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]