moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-04 00:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dragging with middle, X1, or X2 mouse buttons down

Browse Source
This commit is contained in:
Cameron Gutman 2020-05-31 12:40:54 -07:00
parent 3e2e4d13a9
commit 059a943a3d
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Limelight/Input/StreamView.m
View File

@ -227,9 +227,13 @@ 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) {
// Ignore move events from mice. These only happen while the // We must handle this event to properly support
// mouse button is pressed and conflict with our positional // drags while the middle, X1, or X2 mouse buttons are
// mouse input handling. // held down. For some reason, left and right buttons
// don't require this, but we do it anyway for them too.
// Cursor movement without a button held down is handled
// in pointerInteraction:regionForRequest:defaultRegion.
[self updateCursorLocation:[touch locationInView:self]];
return; return;
} }
} }
@ -433,14 +437,11 @@ static const int REFERENCE_HEIGHT = 720;
LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT); LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
} }
#else #else
- (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction - (void) updateCursorLocation:(CGPoint)location {
regionForRequest:(UIPointerRegionRequest *)request
defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4)) {
// These are now relative to the StreamView, however we need to scale them // These are now relative to the StreamView, however we need to scale them
// further to make them relative to the actual video portion. // further to make them relative to the actual video portion.
float x = request.location.x - self.bounds.origin.x; float x = location.x - self.bounds.origin.x;
float y = request.location.y - self.bounds.origin.y; float y = location.y - self.bounds.origin.y;
// For some reason, we don't seem to always get to the bounds of the window // For some reason, we don't seem to always get to the bounds of the window
// so we'll subtract 1 pixel if we're to the left/below of the origin and // so we'll subtract 1 pixel if we're to the left/below of the origin and
@ -491,6 +492,27 @@ static const int REFERENCE_HEIGHT = 720;
lastMouseX = x; lastMouseX = x;
lastMouseY = y; lastMouseY = y;
} }
}
- (UIPointerRegion *)pointerInteraction:(UIPointerInteraction *)interaction
regionForRequest:(UIPointerRegionRequest *)request
defaultRegion:(UIPointerRegion *)defaultRegion API_AVAILABLE(ios(13.4)) {
// This logic mimics what iOS does with AVLayerVideoGravityResizeAspect
CGSize videoSize;
CGPoint videoOrigin;
if (self.bounds.size.width > self.bounds.size.height * streamAspectRatio) {
videoSize = CGSizeMake(self.bounds.size.height * streamAspectRatio, self.bounds.size.height);
} else {
videoSize = CGSizeMake(self.bounds.size.width, self.bounds.size.width / streamAspectRatio);
}
videoOrigin = CGPointMake(self.bounds.size.width / 2 - videoSize.width / 2,
self.bounds.size.height / 2 - videoSize.height / 2);
// Move the cursor on the host if no buttons are pressed.
// Motion with buttons pressed in handled in touchesMoved:
if (lastMouseButtonMask == 0) {
[self updateCursorLocation:request.location];
}
// The pointer interaction should cover the video region only // The pointer interaction should cover the video region only
return [UIPointerRegion regionWithRect:CGRectMake(videoOrigin.x, videoOrigin.y, videoSize.width, videoSize.height) identifier:nil]; return [UIPointerRegion regionWithRect:CGRectMake(videoOrigin.x, videoOrigin.y, videoSize.width, videoSize.height) identifier:nil];