[geany/geany] 0b85db: GTK: Fix double scrolling under X11

Colomban Wendling git-noreply at xxxxx
Thu Feb 23 19:36:08 UTC 2017


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 23 Feb 2017 19:36:08 UTC
Commit:      0b85db49e6ca258746546f9221ee0ec1e1b071b5
             https://github.com/geany/geany/commit/0b85db49e6ca258746546f9221ee0ec1e1b071b5

Log Message:
-----------
GTK: Fix double scrolling under X11

Really restrict smooth scrolling handling to Wayland.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1901/
X-Scintilla-Commit-ID: ae52e0c68190d423505624ae1d26e442e015d48f


Modified Paths:
--------------
    scintilla/gtk/ScintillaGTK.cxx

Modified: scintilla/gtk/ScintillaGTK.cxx
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1801,7 +1801,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) {
 			return FALSE;
 
 #if defined(GDK_WINDOWING_WAYLAND)
-		if (event->direction == GDK_SCROLL_SMOOTH) {
+		if (event->direction == GDK_SCROLL_SMOOTH && GDK_IS_WAYLAND_WINDOW (event->window)) {
 			const int smoothScrollFactor = 4;
 			sciThis->smoothScrollY += event->delta_y * smoothScrollFactor;
 			sciThis->smoothScrollX += event->delta_x * smoothScrollFactor;;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list