From 72547b1b596fe322f3e8bd16484325019eaf6b70 Mon Sep 17 00:00:00 2001 From: True Zhuanjia Date: Thu, 16 May 2024 01:59:32 +0800 Subject: [PATCH] Fix [fingers to tap on keyboard] config not loading. --- Limelight/Database/DataManager.m | 2 +- Limelight/Database/TemporarySettings.h | 1 - Limelight/Input/StreamView.m | 6 +++--- Limelight/ViewControllers/SettingsViewController.m | 10 +++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Limelight/Database/DataManager.m b/Limelight/Database/DataManager.m index 41ade8cd..1d724637 100644 --- a/Limelight/Database/DataManager.m +++ b/Limelight/Database/DataManager.m @@ -78,7 +78,7 @@ settingsToSave.width = [NSNumber numberWithInteger:width]; settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig]; settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls]; - settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:keyboardToggleFingers]; + settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:(uint16_t)keyboardToggleFingers]; settingsToSave.optimizeGames = optimizeGames; settingsToSave.multiController = multiController; settingsToSave.swapABXYButtons = swapABXYButtons; diff --git a/Limelight/Database/TemporarySettings.h b/Limelight/Database/TemporarySettings.h index c15b58d8..0b83b41f 100644 --- a/Limelight/Database/TemporarySettings.h +++ b/Limelight/Database/TemporarySettings.h @@ -19,7 +19,6 @@ @property (nonatomic, retain) NSNumber * audioConfig; @property (nonatomic, retain) NSNumber * onscreenControls; @property (nonatomic, retain) NSNumber * keyboardToggleFingers; -@property (nonatomic, retain) NSNumber * keyboardToggleTaps; @property (nonatomic, retain) NSString * uniqueId; @property (nonatomic) enum { CODEC_PREF_AUTO, diff --git a/Limelight/Input/StreamView.m b/Limelight/Input/StreamView.m index b78cdb40..c2cc2f73 100644 --- a/Limelight/Input/StreamView.m +++ b/Limelight/Input/StreamView.m @@ -54,8 +54,8 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5; - (void) setupStreamView:(ControllerSupport*)controllerSupport interactionDelegate:(id)interactionDelegate config:(StreamConfiguration*)streamConfig { - NSMutableDictionary *pointerIdDict = [NativeTouchHandler initializePointerIdDict]; - NSMutableSet *pointerIdSet = [NativeTouchHandler initializePointerIdSet]; + [NativeTouchHandler initializePointerIdDict]; + [NativeTouchHandler initializePointerIdSet]; self->interactionDelegate = interactionDelegate; self->streamAspectRatio = (float)streamConfig.width / (float)streamConfig.height; @@ -144,7 +144,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5; } - (void)toggleKeyboard{ - if (true){ + if (false){ isInputingText = false; } if (isInputingText) { diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m index 48333dfb..d86106f7 100644 --- a/Limelight/ViewControllers/SettingsViewController.m +++ b/Limelight/ViewControllers/SettingsViewController.m @@ -263,10 +263,9 @@ BOOL isCustomResolution(CGSize res) { [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged]; [self updateBitrateText]; [self updateResolutionDisplayViewText]; - [self.keyboardToggleFingerNumSlider addTarget:self action:@selector(keyboardToggleFingerNumSliderMoved) forControlEvents:(UIControlEventValueChanged)]; - // currentSettings.keyboardToggleFingers = @((uint8_t)self.keyboardToggleFingerNumSlider.value); - - + [self.keyboardToggleFingerNumSlider setValue:(CGFloat)currentSettings.keyboardToggleFingers.intValue animated:YES]; // Load old setting. old setting was converted to uint32_t before saving. + [self.keyboardToggleFingerNumLabel setText:[NSString stringWithFormat:@"Fingers to Tap on Local Keyboard: %@", @((uint16_t)self.keyboardToggleFingerNumSlider.value)]]; // Initiate label display + [self.keyboardToggleFingerNumSlider addTarget:self action:@selector(keyboardToggleFingerNumSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved. } - (void) touchModeChanged { @@ -537,7 +536,8 @@ BOOL isCustomResolution(CGSize res) { NSInteger height = [self getChosenStreamHeight]; NSInteger width = [self getChosenStreamWidth]; NSInteger onscreenControls = [self.onscreenControlSelector selectedSegmentIndex]; - NSInteger keyboardToggleFingers = (uint8_t)self.keyboardToggleFingerNumSlider.value; + NSInteger keyboardToggleFingers = (uint16_t)self.keyboardToggleFingerNumSlider.value; + // NSLog(@"saveSettings keyboardToggleFingers %d", (uint16_t)keyboardToggleFingers); BOOL optimizeGames = [self.optimizeSettingsSelector selectedSegmentIndex] == 1; BOOL multiController = [self.multiControllerSelector selectedSegmentIndex] == 1; BOOL swapABXYButtons = [self.swapABXYButtonsSelector selectedSegmentIndex] == 1;