From 1a76457f416671b00cf8ad3837f2bafb67ad4f74 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 30 Oct 2017 12:48:06 -0300
Subject: [PATCH] macOS: Fix Shift+mouse wheel to scroll horizontally on
 Timeline

Topic: https://community.aseprite.org/t/timeline-scrolling-scroll-wheel-bug/624
---
 src/app/ui/timeline/timeline.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/timeline/timeline.cpp b/src/app/ui/timeline/timeline.cpp
index ad136a4f6..bfeb1f893 100644
--- a/src/app/ui/timeline/timeline.cpp
+++ b/src/app/ui/timeline/timeline.cpp
@@ -1208,8 +1208,8 @@ bool Timeline::onProcessMessage(Message* msg)
           delta.x *= frameBoxWidth();
           delta.y *= layerBoxHeight();
 
-          if (msg->shiftPressed()) {
-            // On macOS shift already changes the wheel axis
+          if (delta.x == 0 && // On macOS shift already changes the wheel axis
+              msg->shiftPressed()) {
             if (std::fabs(delta.y) > delta.x)
               std::swap(delta.x, delta.y);
           }