diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-19 10:43:15 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-19 10:43:15 +0300 |
commit | ba425fa4038580fa71bb944e55fedb04238d7197 (patch) | |
tree | a51cb6cb1bcdcb455719799cfc3f448d643f5249 /sdl2-macos-mouse-scrolling.diff | |
parent | 4b7d2f8978881b8a01f4b37ce33486dfa6484d1c (diff) |
iOS: Updated SDL patch
The SDL patch now contains the macOS scroll event change and, as a new addition, iOS status bar appearance control via the SDL view controller.
Diffstat (limited to 'sdl2-macos-mouse-scrolling.diff')
-rw-r--r-- | sdl2-macos-mouse-scrolling.diff | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/sdl2-macos-mouse-scrolling.diff b/sdl2-macos-mouse-scrolling.diff deleted file mode 100644 index e2f30c24..00000000 --- a/sdl2-macos-mouse-scrolling.diff +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | diff -r 4f06c06b6d19 src/events/SDL_mouse.c | ||
2 | --- a/src/events/SDL_mouse.c Wed Aug 05 15:28:51 2020 +0200 | ||
3 | +++ b/src/events/SDL_mouse.c Tue Nov 10 12:16:06 2020 +0200 | ||
4 | @@ -642,8 +642,8 @@ | ||
5 | event.wheel.preciseX = x; | ||
6 | event.wheel.preciseY = y; | ||
7 | #endif | ||
8 | - event.wheel.x = integral_x; | ||
9 | - event.wheel.y = integral_y; | ||
10 | + event.wheel.x = x; //integral_x; | ||
11 | + event.wheel.y = y; //integral_y; | ||
12 | event.wheel.direction = (Uint32)direction; | ||
13 | posted = (SDL_PushEvent(&event) > 0); | ||
14 | } | ||
15 | diff -r 4f06c06b6d19 src/video/cocoa/SDL_cocoamouse.m | ||
16 | --- a/src/video/cocoa/SDL_cocoamouse.m Wed Aug 05 15:28:51 2020 +0200 | ||
17 | +++ b/src/video/cocoa/SDL_cocoamouse.m Tue Nov 10 12:16:06 2020 +0200 | ||
18 | @@ -424,10 +424,16 @@ | ||
19 | } | ||
20 | |||
21 | SDL_MouseID mouseID = mouse->mouseID; | ||
22 | - CGFloat x = -[event deltaX]; | ||
23 | - CGFloat y = [event deltaY]; | ||
24 | + CGFloat x = -[event scrollingDeltaX]; | ||
25 | + CGFloat y = [event scrollingDeltaY]; | ||
26 | SDL_MouseWheelDirection direction = SDL_MOUSEWHEEL_NORMAL; | ||
27 | |||
28 | + /* HACK: Make a distinction between precise and imprecise scrolling. | ||
29 | + Trackpad seems to be mouseID 0. */ | ||
30 | + if (![event hasPreciseScrollingDeltas]) { | ||
31 | + mouseID = 1; | ||
32 | + } | ||
33 | + | ||
34 | if ([event respondsToSelector:@selector(isDirectionInvertedFromDevice)]) { | ||
35 | if ([event isDirectionInvertedFromDevice] == YES) { | ||
36 | direction = SDL_MOUSEWHEEL_FLIPPED; | ||