moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-06-17 06:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mouse support on iOS 14

Browse Source
This commit is contained in:
Cameron Gutman
2020-09-17 18:59:18 -05:00
parent dfec190b82
commit 2d24b0ec7b
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/Input/StreamView.m
+18 -2
View File
@@ -189,7 +189,23 @@ static const int REFERENCE_HEIGHT = 720;
if (@available(iOS 13.4, *)) { if (@available(iOS 13.4, *)) {
UITouch* touch = [touches anyObject]; UITouch* touch = [touches anyObject];
if (touch.type == UITouchTypeIndirectPointer) { if (touch.type == UITouchTypeIndirectPointer) {
UIEventButtonMask changedButtons = lastMouseButtonMask ^ event.buttonMask; UIEventButtonMask normalizedButtonMask;
// iOS 14 includes the released button in the buttonMask for the release
// event, while iOS 13 does not. Normalize that behavior here.
if (@available(iOS 14.0, *)) {
if (buttonAction == BUTTON_ACTION_RELEASE) {
normalizedButtonMask = lastMouseButtonMask & ~event.buttonMask;
}
else {
normalizedButtonMask = event.buttonMask;
}
}
else {
normalizedButtonMask = event.buttonMask;
}
UIEventButtonMask changedButtons = lastMouseButtonMask ^ normalizedButtonMask;
for (int i = BUTTON_LEFT; i <= BUTTON_X2; i++) { for (int i = BUTTON_LEFT; i <= BUTTON_X2; i++) {
UIEventButtonMask buttonFlag; UIEventButtonMask buttonFlag;
@@ -213,7 +229,7 @@ static const int REFERENCE_HEIGHT = 720;
} }
} }
lastMouseButtonMask = event.buttonMask; lastMouseButtonMask = normalizedButtonMask;
return YES; return YES;
} }
} }