recover absolute touch related codes
This commit is contained in:
@@ -125,19 +125,19 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
||||
// mice correctly, but UIKit does. We will register for both and ignore UIKit
|
||||
// events if a GCMouse is connected.
|
||||
if (@available(iOS 13.4, *)) {
|
||||
// [self addInteraction:[[UIPointerInteraction alloc] initWithDelegate:self]];
|
||||
//
|
||||
// UIPanGestureRecognizer *discreteMouseWheelRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(mouseWheelMovedDiscrete:)];
|
||||
// discreteMouseWheelRecognizer.maximumNumberOfTouches = 0;
|
||||
// discreteMouseWheelRecognizer.allowedScrollTypesMask = UIScrollTypeMaskDiscrete;
|
||||
// discreteMouseWheelRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirectPointer)];
|
||||
// [self addGestureRecognizer:discreteMouseWheelRecognizer];
|
||||
//
|
||||
// UIPanGestureRecognizer *continuousMouseWheelRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(mouseWheelMovedContinuous:)];
|
||||
// continuousMouseWheelRecognizer.maximumNumberOfTouches = 0;
|
||||
// continuousMouseWheelRecognizer.allowedScrollTypesMask = UIScrollTypeMaskContinuous;
|
||||
// continuousMouseWheelRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirectPointer)];
|
||||
// [self addGestureRecognizer:continuousMouseWheelRecognizer];
|
||||
[self addInteraction:[[UIPointerInteraction alloc] initWithDelegate:self]];
|
||||
|
||||
UIPanGestureRecognizer *discreteMouseWheelRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(mouseWheelMovedDiscrete:)];
|
||||
discreteMouseWheelRecognizer.maximumNumberOfTouches = 0;
|
||||
discreteMouseWheelRecognizer.allowedScrollTypesMask = UIScrollTypeMaskDiscrete;
|
||||
discreteMouseWheelRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirectPointer)];
|
||||
[self addGestureRecognizer:discreteMouseWheelRecognizer];
|
||||
|
||||
UIPanGestureRecognizer *continuousMouseWheelRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(mouseWheelMovedContinuous:)];
|
||||
continuousMouseWheelRecognizer.maximumNumberOfTouches = 0;
|
||||
continuousMouseWheelRecognizer.allowedScrollTypesMask = UIScrollTypeMaskContinuous;
|
||||
continuousMouseWheelRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirectPointer)];
|
||||
[self addGestureRecognizer:continuousMouseWheelRecognizer];
|
||||
}
|
||||
|
||||
#if defined(__IPHONE_16_1) || defined(__TVOS_16_1)
|
||||
|
||||
@@ -192,24 +192,24 @@
|
||||
#endif
|
||||
|
||||
// Only enable scroll and zoom in absolute touch mode
|
||||
// if (_settings.absoluteTouchMode) {
|
||||
// _scrollView = [[UIScrollView alloc] initWithFrame:self.view.frame];
|
||||
//#if !TARGET_OS_TV
|
||||
// [_scrollView.panGestureRecognizer setMinimumNumberOfTouches:2];
|
||||
//#endif
|
||||
// [_scrollView setShowsHorizontalScrollIndicator:NO];
|
||||
// [_scrollView setShowsVerticalScrollIndicator:NO];
|
||||
// [_scrollView setDelegate:self];
|
||||
// [_scrollView setMaximumZoomScale:10.0f];
|
||||
//
|
||||
// // Add StreamView inside a UIScrollView for absolute mode
|
||||
// [_scrollView addSubview:_streamView];
|
||||
// [self.view addSubview:_scrollView];
|
||||
// }
|
||||
// else {
|
||||
// // Add StreamView directly in relative mode
|
||||
// [self.view addSubview:_streamView];
|
||||
// }
|
||||
if (_settings.touchMode.intValue == ABSOLUTE_TOUCH_MODE) {
|
||||
_scrollView = [[UIScrollView alloc] initWithFrame:self.view.frame];
|
||||
#if !TARGET_OS_TV
|
||||
[_scrollView.panGestureRecognizer setMinimumNumberOfTouches:2];
|
||||
#endif
|
||||
[_scrollView setShowsHorizontalScrollIndicator:NO];
|
||||
[_scrollView setShowsVerticalScrollIndicator:NO];
|
||||
[_scrollView setDelegate:self];
|
||||
[_scrollView setMaximumZoomScale:10.0f];
|
||||
|
||||
// Add StreamView inside a UIScrollView for absolute mode
|
||||
[_scrollView addSubview:_streamView];
|
||||
[self.view addSubview:_scrollView];
|
||||
}
|
||||
else {
|
||||
// Add StreamView directly in relative mode
|
||||
[self.view addSubview:_streamView];
|
||||
}
|
||||
[self.view addSubview:_streamView];
|
||||
[self.view addSubview:_stageLabel];
|
||||
[self.view addSubview:_spinner];
|
||||
|
||||
Reference in New Issue
Block a user