gtkgesture: Fix get-center for touchpad gestures
authorYariv Barkan <nushoin@users.noreply.github.com>
Tue, 17 Dec 2019 11:28:17 +0000 (13:28 +0200)
committerYariv Barkan <21448-yarivb@users.noreply.gitlab.gnome.org>
Fri, 17 Jan 2020 20:34:48 +0000 (22:34 +0200)
Touchpad gestures have only a single event sequence. The current
'center' of the gesture is the starting point + accumulated deltas.
Update gtk_gesture_get_bounding_box_center() accordingly.

gtk/gtkgesture.c

index 165936d7c7ffd3e1ed3c33f9951ba787a7dcb171..5e95de0cf9631d485ade38271023ebfb0d89146b 100644 (file)
@@ -1335,12 +1335,19 @@ gtk_gesture_get_bounding_box_center (GtkGesture *gesture,
                                      gdouble    *x,
                                      gdouble    *y)
 {
+  const GdkEvent *last_event;
   GdkRectangle rect;
+  GdkEventSequence *sequence;
 
   g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
   g_return_val_if_fail (x != NULL && y != NULL, FALSE);
 
-  if (!gtk_gesture_get_bounding_box (gesture, &rect))
+  sequence = gtk_gesture_get_last_updated_sequence (gesture);
+  last_event = gtk_gesture_get_last_event (gesture, sequence);
+
+  if (EVENT_IS_TOUCHPAD_GESTURE (last_event))
+    return gtk_gesture_get_point (gesture, sequence, x, y);
+  else if (!gtk_gesture_get_bounding_box (gesture, &rect))
     return FALSE;
 
   *x = rect.x + rect.width / 2;