diff options
| author | Akemi <der.richter@gmx.de> | 2017-02-18 03:48:25 +0100 |
|---|---|---|
| committer | Akemi <der.richter@gmx.de> | 2017-02-19 17:54:06 +0100 |
| commit | 3064bbe1dd9aa16c845fa3ed2bc66a74c25ebdc7 (patch) | |
| tree | 904e14cadfbe92155e09be82a1571485447a6d2b | |
| parent | f9369750b199825aca4db21926f382a32f12697c (diff) | |
| download | mpv-3064bbe1dd9aa16c845fa3ed2bc66a74c25ebdc7.tar.bz2 mpv-3064bbe1dd9aa16c845fa3ed2bc66a74c25ebdc7.tar.xz | |
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
| -rw-r--r-- | video/out/cocoa/events_view.m | 3 |
1 files changed, 2 insertions, 1 deletions
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]; } } |