From 738ecc0a8fb4e40fb0c5ca1854fce0d7e2770e41 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 28 Sep 2022 22:09:13 +0800 Subject: [PATCH] PrefWindow // Disable Voltaire-related settings. --- Source/Modules/WindowControllers/ctlPrefWindow.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Modules/WindowControllers/ctlPrefWindow.swift b/Source/Modules/WindowControllers/ctlPrefWindow.swift index 37856bdf..0272d84e 100644 --- a/Source/Modules/WindowControllers/ctlPrefWindow.swift +++ b/Source/Modules/WindowControllers/ctlPrefWindow.swift @@ -135,6 +135,7 @@ class ctlPrefWindow: NSWindowController { } selectionKeyComboBox.stringValue = candidateSelectionKeys + selectionKeyComboBox.isEnabled = false // 無法與 IMKCandidates 協作，故禁用。 } // 這裡有必要加上這段處理，用來確保藉由偏好設定介面動過的 CNS 開關能夠立刻生效。 @@ -281,8 +282,9 @@ extension ctlPrefWindow: NSToolbarDelegate { } var toolbarIdentifiers: [NSToolbarItem.Identifier] { - if #unavailable(macOS 10.13) { return [.ofGeneral, .ofExperience, .ofDictionary, .ofKeyboard] } - return [.ofGeneral, .ofExperience, .ofDictionary, .ofKeyboard, .ofDevZone] + // if #unavailable(macOS 10.13) { return [.ofGeneral, .ofExperience, .ofDictionary, .ofKeyboard] } + // return [.ofGeneral, .ofExperience, .ofDictionary, .ofKeyboard, .ofDevZone] + [.ofGeneral, .ofExperience, .ofDictionary, .ofKeyboard] } func toolbarDefaultItemIdentifiers(_: NSToolbar) -> [NSToolbarItem.Identifier] {