Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Wed, 04 Mar 2015 11:40:45 UTC Commit: 7fa8b3a6953f734593e027a7ef7a8f93064be04c https://github.com/geany/geany/commit/7fa8b3a6953f734593e027a7ef7a8f93064be0...

Log Message: ----------- Backport adaptive scrolling patch from scintilla

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

Modified: scintilla/gtk/ScintillaGTK.cxx 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -1988,10 +1988,11 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { // Compute amount and direction to scroll (even tho on win32 there is // intensity of scrolling info in the native message, gtk doesn't // support this so we simulate similarly adaptive scrolling) - // Note that this is disabled on OS X (Darwin) where the X11 server already has - // and adaptive scrolling algorithm that fights with this one + // Note that this is disabled on OS X (Darwin) with the X11 backend + // where the X11 server already has an adaptive scrolling algorithm + // that fights with this one int cLineScroll; -#if defined(__MWERKS__) || defined(__APPLE_CPP__) || defined(__APPLE_CC__) +#if defined(__APPLE__) && !defined(GDK_WINDOWING_QUARTZ) cLineScroll = sciThis->linesPerScroll; if (cLineScroll == 0) cLineScroll = 4;

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