From 3064bbe1dd9aa16c845fa3ed2bc66a74c25ebdc7 Mon Sep 17 00:00:00 2001
From: Akemi <der.richter@gmx.de>
Date: Sat, 18 Feb 2017 03:48:25 +0100
Subject: cocoa: fix scroll wheel input with Shift modifier

holding shift swaps the scroll wheel axes and deltaY returned zero.
summing up deltaX and deltaY will always give us the right button.

Fixes #3506
---
 video/out/cocoa/events_view.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m
index d91c68046b..1bb816facf 100644
--- a/video/out/cocoa/events_view.m
+++ b/video/out/cocoa/events_view.m
@@ -266,7 +266,8 @@
         [self preciseScroll:event];
     } else {
         const int modifiers = [event modifierFlags];
-        const int mpkey = [event deltaY] > 0 ? MP_MOUSE_BTN3 : MP_MOUSE_BTN4;
+        const int mpkey = ([event deltaX] + [event deltaY]) > 0 ?
+                            MP_MOUSE_BTN3 : MP_MOUSE_BTN4;
         [self.adapter putKey:mpkey withModifiers:modifiers];
     }
 }
-- 
cgit v1.2.3