diff --git a/VoidLink/Input/AbsoluteTouchHandler.m b/VoidLink/Input/AbsoluteTouchHandler.m index 3d6896d9..a398932e 100644 --- a/VoidLink/Input/AbsoluteTouchHandler.m +++ b/VoidLink/Input/AbsoluteTouchHandler.m @@ -135,7 +135,7 @@ if (capturedTouch.timestamp - lastTouchUp.timestamp > DOUBLE_TAP_DEAD_ZONE_DELAY || sqrt(pow((touchLocation.x / streamView.bounds.size.width) - (lastTouchUpLocation.x / streamView.bounds.size.width), 2) + pow((touchLocation.y / streamView.bounds.size.height) - (lastTouchUpLocation.y / streamView.bounds.size.height), 2)) > DOUBLE_TAP_DEAD_ZONE_DELTA) { - [streamView updateCursorLocation:touchLocation isMouse:NO]; + if(!multiTouchesDetected) [streamView updateCursorLocation:touchLocation isMouse:NO]; } // Press the left button down diff --git a/VoidLink/ViewControllers/SettingsViewController.m b/VoidLink/ViewControllers/SettingsViewController.m index 45032c85..332269b7 100644 --- a/VoidLink/ViewControllers/SettingsViewController.m +++ b/VoidLink/ViewControllers/SettingsViewController.m @@ -446,6 +446,8 @@ BOOL isCustomResolution(int resolutionSelected) { if(![self manuallyChangedFPS]) [self framerateChanged]; [self reloadMotionControlConfigs]; + + self->tempSettings = [self->dataMan getSettings]; } - (void)viewDidAppear:(BOOL)animated{ @@ -454,17 +456,16 @@ BOOL isCustomResolution(int resolutionSelected) { [self updateParentStackHorizontalConstraints]; [self updateResolutionTable]; - [self.customResolutionSwitch addTarget:self action:@selector(customResolutionSwitched:) forControlEvents:UIControlEventValueChanged]; - self->tempSettings = [self->dataMan getSettings]; + _scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x, tempSettings.settingsMenuOffset.floatValue); + + [self.customResolutionSwitch addTarget:self action:@selector(customResolutionSwitched:) forControlEvents:UIControlEventValueChanged]; //CGSize currentResolution = CGSizeMake(currentSettings.width.intValue, currentSettings.height.intValue); [self.customResolutionSwitch setOn: isCustomResolution(self->tempSettings.resolutionSelected.intValue)]; [self.resolutionSelector setEnabled:!self.customResolutionSwitch.isOn]; [self touchModeChanged:self.touchModeSelector1]; // a special fix for iOS 14 to set hidden for the "enableOswStack" - - _scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x, tempSettings.settingsMenuOffset.floatValue); - + settingsViewJustExpanded = false; }