rename & refactor mouseMode to localMousePointerMode
This commit is contained in:
1 parent
9ffeba72fe
commit
858843ff9a
17 files changed
+99
-96
No files matched your search
@@ -670,7 +670,7 @@ static NSMutableSet* hostList;
|
||||
// multiController must be set before calling getConnectedGamepadMask
|
||||
_streamConfig.multiController = streamSettings.multiController;
|
||||
_streamConfig.gamepadMask = [ControllerSupport getConnectedGamepadMask:_streamConfig];
|
||||
_streamConfig.mouseMode = streamSettings.mouseMode.intValue;
|
||||
_streamConfig.localMousePointerMode = streamSettings.localMousePointerMode.intValue;
|
||||
|
||||
// Probe for supported channel configurations
|
||||
int physicalOutputChannels = (int)[AVAudioSession sharedInstance].maximumOutputNumberOfChannels;
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
@property (nonatomic, strong) MainFrameViewController *mainFrameViewController;
|
||||
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *externalDisplayModeSelector;
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *mouseModeSelector;
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *localMousePointerModeSelector;
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wunguarded-availability"
|
||||
|
||||
@@ -560,7 +560,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
}
|
||||
|
||||
[self.externalDisplayModeSelector setSelectedSegmentIndex:currentSettings.externalDisplayMode.integerValue];
|
||||
[self.mouseModeSelector setSelectedSegmentIndex:currentSettings.mouseMode.integerValue];
|
||||
[self.localMousePointerModeSelector setSelectedSegmentIndex:currentSettings.localMousePointerMode.integerValue];
|
||||
}
|
||||
|
||||
- (void)slideToSettingsScreenEdgeChanged{
|
||||
@@ -1068,7 +1068,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
BOOL allowPortrait = [self.allowPortraitSelector selectedSegmentIndex] == 1;
|
||||
NSInteger resolutionSelected = [self.resolutionSelector selectedSegmentIndex];
|
||||
NSInteger externalDisplayMode = [self.externalDisplayModeSelector selectedSegmentIndex];
|
||||
NSInteger mouseMode = [self.mouseModeSelector selectedSegmentIndex];
|
||||
NSInteger localMousePointerMode = [self.localMousePointerModeSelector selectedSegmentIndex];
|
||||
[dataMan saveSettingsWithBitrate:_bitrate
|
||||
framerate:framerate
|
||||
height:height
|
||||
@@ -1101,7 +1101,7 @@ BOOL isCustomResolution(CGSize res) {
|
||||
allowPortrait:allowPortrait
|
||||
resolutionSelected:resolutionSelected
|
||||
externalDisplayMode:externalDisplayMode
|
||||
mouseMode:mouseMode];
|
||||
localMousePointerMode:localMousePointerMode];
|
||||
}
|
||||
|
||||
- (void)didReceiveMemoryWarning {
|
||||
|
||||
@@ -957,10 +957,10 @@
|
||||
DataManager* dataMan = [[DataManager alloc] init];
|
||||
Settings *currentSettings = [dataMan retrieveSettings];
|
||||
|
||||
if(currentSettings.mouseMode.intValue == 0){
|
||||
currentSettings.mouseMode = @1;
|
||||
if(currentSettings.localMousePointerMode.intValue == 0){
|
||||
currentSettings.localMousePointerMode = @1;
|
||||
}else{
|
||||
currentSettings.mouseMode = @0;
|
||||
currentSettings.localMousePointerMode = @0;
|
||||
}
|
||||
|
||||
[dataMan saveData];
|
||||
@@ -971,10 +971,10 @@
|
||||
DataManager* dataMan = [[DataManager alloc] init];
|
||||
Settings *currentSettings = [dataMan retrieveSettings];
|
||||
|
||||
if(currentSettings.mouseMode.intValue == 2){
|
||||
currentSettings.mouseMode = @1;
|
||||
if(currentSettings.localMousePointerMode.intValue == 2){
|
||||
currentSettings.localMousePointerMode = @1;
|
||||
}else{
|
||||
currentSettings.mouseMode = @2;
|
||||
currentSettings.localMousePointerMode = @2;
|
||||
}
|
||||
|
||||
[dataMan saveData];
|
||||
@@ -1012,7 +1012,7 @@
|
||||
// Pointer lock breaks the UIKit mouse APIs, which is a problem because
|
||||
// GCMouse is horribly broken on iOS 14.0 for certain mice. Only lock
|
||||
// the cursor if there is a GCMouse present.
|
||||
return ([GCMouse mice].count > 0) && [_settings mouseMode].intValue == 0;
|
||||
return ([GCMouse mice].count > 0) && [_settings localMousePointerMode].intValue == 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user