patch 9.1.0348: X11 does not ignore smooth scroll event

Problem:  X11 does not ignore smooth scroll event
          (laniakea64)
Solution: Correctly ignore unwanted smooth scroll events on X11
          (lilydjwg)

fixes #14578
closes: #14583

Signed-off-by: lilydjwg <lilydjwg@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index d4a8b936486a4ff98d485766ac14f3bdea372871..4d201fcaede6655921905f838662aafc78709181 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2152,6 +2152,9 @@ scroll_event(GtkWidget *widget,
                    FALSE, vim_modifiers);
        }
     }
+    else if (event->direction == GDK_SCROLL_SMOOTH && display_type == DT_X11)
+       // for X11 we deal with unsmooth events, and so ignore the smooth ones
+       ;
     else
 #undef DT_X11
 #undef DT_WAYLAND

diff --git a/src/version.c b/src/version.c
index 82bb55bf8bd2cffd05561722ff61c89dd073ad49..85156acfeae6f55fff51a8ccb5b5a17746c47df3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    348,
 /**/
     347,
 /**/