summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Mikhaylenko <alexm@gnome.org>2022-05-02 23:04:45 +0400
committerAlexander Mikhaylenko <alexm@gnome.org>2022-05-02 23:04:45 +0400
commit41fff5c88aa8d659ebb3b9224a46a9323e04d4b9 (patch)
tree37ff2f6c301477ab2e751bac939f2b412816eb5e
parent53a69af780686679b44510e31e2a6d1c6f278901 (diff)
downloadgtk+-41fff5c88aa8d659ebb3b9224a46a9323e04d4b9.tar.gz
Revert "gestureswipe: Allow scroll events"
This reverts commit 03de3ceaf1e64fad007535c175e4bf50181e32bb.
-rw-r--r--gtk/gtkgestureswipe.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk/gtkgestureswipe.c b/gtk/gtkgestureswipe.c
index d1463eedaa..6756a73215 100644
--- a/gtk/gtkgestureswipe.c
+++ b/gtk/gtkgestureswipe.c
@@ -85,11 +85,9 @@ static GtkFilterEventStatus
gtk_gesture_swipe_filter_event (GtkEventController *controller,
GdkEvent *event)
{
- GdkEventType event_type = gdk_event_get_event_type (event);
-
/* Let touchpad swipe and hold events go through, only if they match n-points */
- if (event_type == GDK_TOUCHPAD_SWIPE ||
- event_type == GDK_TOUCHPAD_HOLD)
+ if (gdk_event_get_event_type (event) == GDK_TOUCHPAD_SWIPE ||
+ gdk_event_get_event_type (event) == GDK_TOUCHPAD_HOLD)
{
guint n_points;
guint n_fingers;
@@ -104,9 +102,6 @@ gtk_gesture_swipe_filter_event (GtkEventController *controller,
return GTK_EVENT_SKIP;
}
- if (event_type == GDK_SCROLL)
- return GTK_EVENT_HANDLE;
-
return GTK_EVENT_CONTROLLER_CLASS (gtk_gesture_swipe_parent_class)->filter_event (controller, event);
}