From 298c1425be16d8dddea285e6fc4c95284974e482 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Tue, 16 Aug 2022 08:12:40 +0800 Subject: [PATCH] PrefUI // Move certain DevZone options to Experiences pane. --- Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift | 8 -------- .../Modules/UIModules/PrefUI/suiPrefPaneExperience.swift | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift index c6639bb1..0de10a9d 100644 --- a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift +++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift @@ -16,8 +16,6 @@ struct suiPrefPaneDevZone: View { forKey: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue) @State private var selShouldAlwaysUseShiftKeyAccommodation: Bool = UserDefaults.standard.bool( forKey: UserDef.kShouldAlwaysUseShiftKeyAccommodation.rawValue) - @State private var selDisableShiftTogglingAlphanumericalMode: Bool = UserDefaults.standard.bool( - forKey: UserDef.kDisableShiftTogglingAlphanumericalMode.rawValue) private let contentWidth: Double = { switch mgrPrefs.appleLanguages[0] { case "ja": @@ -72,12 +70,6 @@ struct suiPrefPaneDevZone: View { ) ) .preferenceDescription().fixedSize(horizontal: false, vertical: true) - Toggle( - LocalizedStringKey("Completely disable using Shift key to toggling alphanumerical mode"), - isOn: $selDisableShiftTogglingAlphanumericalMode.onChange { - mgrPrefs.disableShiftTogglingAlphanumericalMode = selDisableShiftTogglingAlphanumericalMode - } - ) } } } diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift index 0c209b30..463d90b7 100644 --- a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift +++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift @@ -36,6 +36,8 @@ struct suiPrefPaneExperience: View { forKey: UserDef.kTogglingAlphanumericalModeWithLShift.rawValue) @State private var selUpperCaseLetterKeyBehavior = UserDefaults.standard.integer( forKey: UserDef.kUpperCaseLetterKeyBehavior.rawValue) + @State private var selDisableShiftTogglingAlphanumericalMode: Bool = UserDefaults.standard.bool( + forKey: UserDef.kDisableShiftTogglingAlphanumericalMode.rawValue) private let contentWidth: Double = { switch mgrPrefs.appleLanguages[0] { case "ja": @@ -149,6 +151,12 @@ struct suiPrefPaneExperience: View { isOn: $selTogglingAlphanumericalModeWithLShift.onChange { mgrPrefs.togglingAlphanumericalModeWithLShift = selTogglingAlphanumericalModeWithLShift } + ).disabled(mgrPrefs.disableShiftTogglingAlphanumericalMode == true) + Toggle( + LocalizedStringKey("Completely disable using Shift key to toggling alphanumerical mode"), + isOn: $selDisableShiftTogglingAlphanumericalMode.onChange { + mgrPrefs.disableShiftTogglingAlphanumericalMode = selDisableShiftTogglingAlphanumericalMode + } ) Toggle( LocalizedStringKey("Allow backspace-editing miscomposed readings"),