From 9174650c1e90454859531149326d7ac32096959e Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 25 May 2013 07:04:59 -0700 Subject: [PATCH] Don't invert horizontal scroll on the audio display on OS X For some reason horizontal scroll comes pre-flipped. --- aegisub/src/audio_box.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp index c711958af..5922a0ea4 100644 --- a/aegisub/src/audio_box.cpp +++ b/aegisub/src/audio_box.cpp @@ -158,9 +158,13 @@ void AudioBox::OnMouseWheel(wxMouseEvent &evt) { if (!zoom) { int amount = -evt.GetWheelRotation() * GetClientSize().GetWidth() / (evt.GetWheelDelta() * 3); + // If the user did a horizontal scroll the amount should be inverted // for it to be natural. + // On OS X it's pre-flipped for some reason. +#ifndef __APPLE__ if (evt.GetWheelAxis() == 1) amount = -amount; +#endif // Reset any accumulated zoom mouse_zoom_accum = 0;