From bb315b612f5e0ea8b6fddd03626898302ebe792c Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Sun, 24 Nov 2013 09:12:37 +1100
Subject: Disable scroll wheel magnification by default since it causes visual
 garbage to appear on OS X 10.9 when scrolling horizontally on a retina
 display.

---
 cocoa/ScintillaView.mm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index f64d1eaa1..9bc0a5d1c 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -615,7 +615,11 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
 
 /**
  * Mouse wheel with command key magnifies text.
+ * Enabling this code causes visual garbage to appear when scrolling
+ * horizontally on OS X 10.9 with a retina display.
+ * Pinch gestures and key commands can be used for magnification.
  */
+#ifdef SCROLL_WHEEL_MAGNIFICATION
 - (void) scrollWheel: (NSEvent *) theEvent
 {
   if (([theEvent modifierFlags] & NSCommandKeyMask) != 0) {
@@ -624,6 +628,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
     [super scrollWheel:theEvent];
   }
 }
+#endif
 
 //--------------------------------------------------------------------------------------------------
 
-- 
cgit v1.2.3