diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2013-11-24 09:12:37 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2013-11-24 09:12:37 +1100 |
| commit | bb315b612f5e0ea8b6fddd03626898302ebe792c (patch) | |
| tree | 82c17535a0384be454471440a74a1835942811cc | |
| parent | 820bb1c8f3fbe7a1c6b03a0bd6212c2538947c7b (diff) | |
| download | scintilla-mirror-bb315b612f5e0ea8b6fddd03626898302ebe792c.tar.gz | |
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.
| -rw-r--r-- | cocoa/ScintillaView.mm | 5 |
1 files changed, 5 insertions, 0 deletions
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 //-------------------------------------------------------------------------------------------------- |