From af4076865da909195a1eeb390a9f6ad705b71df4 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 1 Oct 2019 23:26:39 -0400 Subject: [PATCH] Fix two-finger scrolling on wxGTK under Wayland When running under Wayland and using two-finger scrolling, GTK seems to only emit "smooth" scrolling events. The code was already setup to handle GDK_SCROLL_SMOOTH events - we just needed to add GDK_SMOOTH_SCROLL_MASK to the event mast of the window in order to receive the events. Fixes #17734. --- src/gtk/win_gtk.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 9057f30ed4..f74ca023e2 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -364,6 +364,9 @@ GtkWidget* wxPizza::New(long windowStyle) gtk_widget_add_events(widget, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK | +#if GTK_CHECK_VERSION(3,4,0) + GDK_SMOOTH_SCROLL_MASK | +#endif GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK |