hermes-agent/VoidLink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix [fingers to tap on keyboard] config not loading.

Browse Source
This commit is contained in:
True Zhuanjia committed 2024-05-16 01:59:32 +08:00
1 parent 4987298f79
commit 72547b1b59
4 files changed
+9 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Limelight/Database/DataManager.m
+1 -1
View File
@@ -78,7 +78,7 @@
settingsToSave.width = [NSNumber numberWithInteger:width]; settingsToSave.width = [NSNumber numberWithInteger:width];
settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig]; settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig];
settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls]; settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:keyboardToggleFingers]; settingsToSave.keyboardToggleFingers = [NSNumber numberWithInteger:(uint16_t)keyboardToggleFingers];
settingsToSave.optimizeGames = optimizeGames; settingsToSave.optimizeGames = optimizeGames;
settingsToSave.multiController = multiController; settingsToSave.multiController = multiController;
settingsToSave.swapABXYButtons = swapABXYButtons; settingsToSave.swapABXYButtons = swapABXYButtons;
Limelight/Database/TemporarySettings.h
-1
View File
@@ -19,7 +19,6 @@
@property (nonatomic, retain) NSNumber * audioConfig; @property (nonatomic, retain) NSNumber * audioConfig;
@property (nonatomic, retain) NSNumber * onscreenControls; @property (nonatomic, retain) NSNumber * onscreenControls;
@property (nonatomic, retain) NSNumber * keyboardToggleFingers; @property (nonatomic, retain) NSNumber * keyboardToggleFingers;
@property (nonatomic, retain) NSNumber * keyboardToggleTaps;
@property (nonatomic, retain) NSString * uniqueId; @property (nonatomic, retain) NSString * uniqueId;
@property (nonatomic) enum { @property (nonatomic) enum {
CODEC_PREF_AUTO, CODEC_PREF_AUTO,
Limelight/Input/StreamView.m
+3 -3
View File
@@ -54,8 +54,8 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
- (void) setupStreamView:(ControllerSupport*)controllerSupport - (void) setupStreamView:(ControllerSupport*)controllerSupport
interactionDelegate:(id<UserInteractionDelegate>)interactionDelegate interactionDelegate:(id<UserInteractionDelegate>)interactionDelegate
config:(StreamConfiguration*)streamConfig { config:(StreamConfiguration*)streamConfig {
NSMutableDictionary *pointerIdDict = [NativeTouchHandler initializePointerIdDict]; [NativeTouchHandler initializePointerIdDict];
NSMutableSet<NSNumber *> *pointerIdSet = [NativeTouchHandler initializePointerIdSet]; [NativeTouchHandler initializePointerIdSet];
self->interactionDelegate = interactionDelegate; self->interactionDelegate = interactionDelegate;
self->streamAspectRatio = (float)streamConfig.width / (float)streamConfig.height; self->streamAspectRatio = (float)streamConfig.width / (float)streamConfig.height;
@@ -144,7 +144,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
} }
- (void)toggleKeyboard{ - (void)toggleKeyboard{
if (true){ if (false){
isInputingText = false; isInputingText = false;
} }
if (isInputingText) { if (isInputingText) {
Limelight/ViewControllers/SettingsViewController.m
+5 -5
View File
@@ -263,10 +263,9 @@ BOOL isCustomResolution(CGSize res) {
[self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged]; [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
[self updateBitrateText]; [self updateBitrateText];
[self updateResolutionDisplayViewText]; [self updateResolutionDisplayViewText];
[self.keyboardToggleFingerNumSlider addTarget:self action:@selector(keyboardToggleFingerNumSliderMoved) forControlEvents:(UIControlEventValueChanged)]; [self.keyboardToggleFingerNumSlider setValue:(CGFloat)currentSettings.keyboardToggleFingers.intValue animated:YES]; // Load old setting. old setting was converted to uint32_t before saving.
// currentSettings.keyboardToggleFingers = @((uint8_t)self.keyboardToggleFingerNumSlider.value); [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 { - (void) touchModeChanged {
@@ -537,7 +536,8 @@ BOOL isCustomResolution(CGSize res) {
NSInteger height = [self getChosenStreamHeight]; NSInteger height = [self getChosenStreamHeight];
NSInteger width = [self getChosenStreamWidth]; NSInteger width = [self getChosenStreamWidth];
NSInteger onscreenControls = [self.onscreenControlSelector selectedSegmentIndex]; 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 optimizeGames = [self.optimizeSettingsSelector selectedSegmentIndex] == 1;
BOOL multiController = [self.multiControllerSelector selectedSegmentIndex] == 1; BOOL multiController = [self.multiControllerSelector selectedSegmentIndex] == 1;
BOOL swapABXYButtons = [self.swapABXYButtonsSelector selectedSegmentIndex] == 1; BOOL swapABXYButtons = [self.swapABXYButtonsSelector selectedSegmentIndex] == 1;