[gtk+] gesture rotate: Partially convert to GdkEvent API
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gesture rotate: Partially convert to GdkEvent API
- Date: Tue, 19 Sep 2017 17:15:55 +0000 (UTC)
commit 7cbd35dd869e0d12017642feef3ef4410439e93c
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Aug 25 22:53:58 2017 -0400
gesture rotate: Partially convert to GdkEvent API
gtk/gtkgesturerotate.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index a04fdd5..e91a57c 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -83,6 +83,7 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate,
GtkGesture *gesture;
gdouble dx, dy;
GList *sequences;
+ GdkTouchpadGesturePhase phase;
gesture = GTK_GESTURE (rotate);
priv = gtk_gesture_rotate_get_instance_private (rotate);
@@ -96,10 +97,12 @@ _gtk_gesture_rotate_get_angle (GtkGestureRotate *rotate,
last_event = gtk_gesture_get_last_event (gesture, sequences->data);
+ gdk_event_get_touchpad_gesture_phase (last_event, &phase);
+
if (gdk_event_get_event_type (last_event) == GDK_TOUCHPAD_PINCH &&
- (last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
- last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
- last_event->touchpad_pinch.phase == GDK_TOUCHPAD_GESTURE_PHASE_END))
+ (phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
+ phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
+ phase == GDK_TOUCHPAD_GESTURE_PHASE_END))
{
*angle = priv->accum_touchpad_angle;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]