diff --git a/Source/Modules/IMEModules/mgrPrefs.swift b/Source/Modules/IMEModules/mgrPrefs.swift
index 99c4927b..37451445 100644
--- a/Source/Modules/IMEModules/mgrPrefs.swift
+++ b/Source/Modules/IMEModules/mgrPrefs.swift
@@ -551,7 +551,13 @@ public enum mgrPrefs {
static var candidateKeyLabelFontName: String?
@UserDefault(key: UserDef.kCandidateKeys.rawValue, defaultValue: kDefaultKeys)
- static var candidateKeys: String
+ static var candidateKeys: String {
+ didSet {
+ if mgrPrefs.useIMKCandidateWindow {
+ mgrPrefs.candidateKeys = kDefaultKeys
+ }
+ }
+ }
static var defaultCandidateKeys: String {
kDefaultKeys
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
index ffe1fdf0..a3ffb6d7 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
@@ -73,6 +73,7 @@ struct suiPrefPaneGeneral: View {
}
.labelsHidden()
.frame(width: 120.0)
+ .disabled(mgrPrefs.useIMKCandidateWindow)
Text(LocalizedStringKey("Choose candidate font size for better visual clarity."))
.preferenceDescription()
}
@@ -130,6 +131,7 @@ struct suiPrefPaneGeneral: View {
}
)
.controlSize(.small)
+ .disabled(mgrPrefs.useIMKCandidateWindow)
}
Preferences.Section(bottomDivider: true, label: { Text(LocalizedStringKey("Output Settings:")) }) {
Toggle(
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
index c5576600..aa74965e 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
@@ -67,7 +67,7 @@ struct suiPrefPaneKeyboard: View {
}
}
}
- ).frame(width: 180)
+ ).frame(width: 180).disabled(mgrPrefs.useIMKCandidateWindow)
Text(
LocalizedStringKey(
"Choose or hit Enter to confim your prefered keys for selecting candidates."
diff --git a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
index d0536044..5d59da3c 100644
--- a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
+++ b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
@@ -139,6 +139,13 @@
+
+
+
+ NSNegateBoolean
+
+
+
@@ -255,6 +262,11 @@
+
+
+ NSNegateBoolean
+
+
-
+
@@ -371,6 +383,11 @@
+
+
+ NSNegateBoolean
+
+
@@ -593,7 +610,7 @@
-
+
@@ -615,7 +632,7 @@
-
+