diff options
| author | Jiřà Techet <techet@gmail.com> | 2015-02-11 15:10:08 +0100 | 
|---|---|---|
| committer | Jiřà Techet <techet@gmail.com> | 2015-02-11 15:10:08 +0100 | 
| commit | 407d7bb2a13361bbf0a640a25e735534a9da4fb8 (patch) | |
| tree | 895bdbdebeb0d2a492684b8fdd57210d2e14f5f7 | |
| parent | 6fa10acc4e31085d45ee51492d41f219f6f1211c (diff) | |
| download | scintilla-mirror-407d7bb2a13361bbf0a640a25e735534a9da4fb8.tar.gz | |
Don't disable adaptive speed of scrolling on OS X with GTK Quartz backend
There does not seem to be any adaptive scroll speed control when using
the Quartz backend so we can use the one provided by Scintilla.
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index d008215d0..0871ca224 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1990,10 +1990,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; | 
