floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctlPrefWindow // chosenItem -> chosenBaseKeyboardLayoutItem.

This commit is contained in:
ShikiSuen 2022-02-11 21:07:06 +08:00
parent 07f6365c00
commit d315dc80a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/WindowControllers/ctlPrefWindow.swift
View File

@ -68,7 +68,7 @@ extension RangeReplaceableCollection where Element: Hashable {
let list = TISCreateInputSourceList(nil, true).takeRetainedValue() as! [TISInputSource] let list = TISCreateInputSourceList(nil, true).takeRetainedValue() as! [TISInputSource]
var usKeyboardLayoutItem: NSMenuItem? = nil var usKeyboardLayoutItem: NSMenuItem? = nil
var chosenItem: NSMenuItem? = nil var chosenBaseKeyboardLayoutItem: NSMenuItem? = nil
basisKeyboardLayoutButton.menu?.removeAllItems() basisKeyboardLayoutButton.menu?.removeAllItems()
@ -127,7 +127,7 @@ extension RangeReplaceableCollection where Element: Hashable {
usKeyboardLayoutItem = menuItem usKeyboardLayoutItem = menuItem
} }
if basisKeyboardLayoutID == sourceID { if basisKeyboardLayoutID == sourceID {
chosenItem = menuItem chosenBaseKeyboardLayoutItem = menuItem
} }
basisKeyboardLayoutButton.menu?.addItem(menuItem) basisKeyboardLayoutButton.menu?.addItem(menuItem)
} }
@ -136,8 +136,8 @@ extension RangeReplaceableCollection where Element: Hashable {
menuItem.title = String(format: NSLocalizedString("Apple Zhuyin Bopomofo", comment: "")) menuItem.title = String(format: NSLocalizedString("Apple Zhuyin Bopomofo", comment: ""))
menuItem.representedObject = String("com.apple.keylayout.ZhuyinBopomofo") menuItem.representedObject = String("com.apple.keylayout.ZhuyinBopomofo")
basisKeyboardLayoutButton.menu?.addItem(menuItem) basisKeyboardLayoutButton.menu?.addItem(menuItem)
basisKeyboardLayoutButton.select(chosenBaseKeyboardLayoutItem ?? usKeyboardLayoutItem)
basisKeyboardLayoutButton.select(chosenItem ?? usKeyboardLayoutItem)
selectionKeyComboBox.usesDataSource = false selectionKeyComboBox.usesDataSource = false
selectionKeyComboBox.removeAllItems() selectionKeyComboBox.removeAllItems()
selectionKeyComboBox.addItems(withObjectValues: Preferences.suggestedCandidateKeys) selectionKeyComboBox.addItems(withObjectValues: Preferences.suggestedCandidateKeys)