diff --git a/VoidLink/Localization/Localizable.xcstrings b/VoidLink/Localization/Localizable.xcstrings index fee9f464..d763de87 100644 --- a/VoidLink/Localization/Localizable.xcstrings +++ b/VoidLink/Localization/Localizable.xcstrings @@ -4603,25 +4603,25 @@ } } }, - "Touch & Control" : { + "Touch & Controller" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "触屏与控制" + "value" : "触屏与手柄" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "觸控與控制" + "value" : "觸控與控制器" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "觸控與控制" + "value" : "觸控與控制器" } } } diff --git a/VoidLink/ViewControllers/MainFrameViewController.m b/VoidLink/ViewControllers/MainFrameViewController.m index 3041ea50..84c53759 100644 --- a/VoidLink/ViewControllers/MainFrameViewController.m +++ b/VoidLink/ViewControllers/MainFrameViewController.m @@ -1145,7 +1145,7 @@ static NSMutableSet* hostList; [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.audioOnPcStack]; [settingsViewController.codecSelector setEnabled:!_settingsExpandedInStreamView]; [settingsViewController.yuv444Switch setEnabled:!_settingsExpandedInStreamView]; - [settingsViewController.hdrSwitch setEnabled:!_settingsExpandedInStreamView]; + [settingsViewController.hdrSwitch setEnabled:!_settingsExpandedInStreamView && [settingsViewController hdrSupported]]; [settingsViewController.gyroModeSelector setEnabled:!_settingsExpandedInStreamView || ![streamFrameViewController shallDisableGyroHotSwitch]]; [settingsViewController.emulatedControllerTypeSelector setEnabled:!_settingsExpandedInStreamView]; [settingsViewController setHidden:_settingsExpandedInStreamView forStack:settingsViewController.framepacingStack]; @@ -1471,7 +1471,7 @@ static NSMutableSet* hostList; if (@available(iOS 13.0, *)) { [_upButton setTitle:@""]; - UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:23 weight:UIImageSymbolWeightMedium ]; + UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:21.5 weight:UIImageSymbolWeightMedium ]; UIImage *image = [[UIImage systemImageNamed:@"tv" withConfiguration:config] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; [_upButton setImage:image]; _upButton.imageInsets = UIEdgeInsetsMake(25, 20, 0, 15); diff --git a/VoidLink/ViewControllers/SettingsViewController.h b/VoidLink/ViewControllers/SettingsViewController.h index 6e39d57a..e0c35611 100644 --- a/VoidLink/ViewControllers/SettingsViewController.h +++ b/VoidLink/ViewControllers/SettingsViewController.h @@ -122,6 +122,7 @@ #pragma clang diagnostic pop +- (bool)hdrSupported; - (void)saveSettings; + (bool)isLandscapeNow; - (void)updateResolutionTable; diff --git a/VoidLink/ViewControllers/SettingsViewController.m b/VoidLink/ViewControllers/SettingsViewController.m index cf6b85ef..6903890c 100644 --- a/VoidLink/ViewControllers/SettingsViewController.m +++ b/VoidLink/ViewControllers/SettingsViewController.m @@ -528,7 +528,7 @@ BOOL isCustomResolution(CGSize res) { touchAndControlSection = [[MenuSectionView alloc] init]; touchAndControlSection.delegate = self; - touchAndControlSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch & Control"]; + touchAndControlSection.sectionTitle = [LocalizationHelper localizedStringForKey:@"Touch & Controller"]; if (@available(iOS 13.0, *)) { [touchAndControlSection setSectionWithIcon:[UIImage imageNamed:@"arcade.stick.console"] andSize:20.5]; } @@ -1324,7 +1324,7 @@ BOOL isCustomResolution(CGSize res) { if (![self hdrSupported]) { [self.hdrSwitch setOn:NO]; - [self widget:self.hdrSwitch setEnabled:NO]; + [self.hdrSwitch setEnabled:NO]; } else { [self.hdrSwitch setOn:currentSettings.enableHdr];