From d7cf8ced2505ad56c8e90ad5f35564b71398ad30 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 5 Oct 2021 21:42:37 -0500 Subject: [PATCH] Go back to UIPanGestureRecognizer for all scroll events GCMouse is broken in iPad 15 for mice with discrete scroll wheel events --- Limelight/Input/ControllerSupport.m | 13 ------------- Limelight/Input/StreamView.m | 7 ------- 2 files changed, 20 deletions(-) diff --git a/Limelight/Input/ControllerSupport.m b/Limelight/Input/ControllerSupport.m index 69fc33d..ca4a7fa 100644 --- a/Limelight/Input/ControllerSupport.m +++ b/Limelight/Input/ControllerSupport.m @@ -432,19 +432,6 @@ static const double MOUSE_SPEED_DIVISOR = 2.5; }; } } - - // TODO: Confirm scroll direction - mouse.mouseInput.scroll.yAxis.valueChangedHandler = ^(GCControllerAxisInput * _Nonnull axis, float value) { - self->accumulatedScrollY += -value; - - short truncatedScrollY = (short)self->accumulatedScrollY; - - if (truncatedScrollY != 0) { - LiSendHighResScrollEvent(truncatedScrollY); - - self->accumulatedScrollY -= truncatedScrollY; - } - }; } -(void) updateAutoOnScreenControlMode diff --git a/Limelight/Input/StreamView.m b/Limelight/Input/StreamView.m index c39f20f..a1d30e7 100644 --- a/Limelight/Input/StreamView.m +++ b/Limelight/Input/StreamView.m @@ -449,13 +449,6 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5; } - (void)mouseWheelMoved:(UIPanGestureRecognizer *)gesture { - if (@available(iOS 14.0, *)) { - if ([GCMouse current] != nil) { - // We'll handle this with GCMouse. Do nothing here. - return; - } - } - switch (gesture.state) { case UIGestureRecognizerStateBegan: case UIGestureRecognizerStateChanged: