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

PrefUI // Remove limitations regarding choices of keyboard layouts.

This commit is contained in:
ShikiSuen 2022-10-09 15:18:15 +08:00
parent d0c704f9bf
commit ae776fb12d
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
View File

@ -101,18 +101,6 @@ struct suiPrefPaneKeyboard: View {
selection: $selKeyboardParser.onChange { selection: $selKeyboardParser.onChange {
let value = selKeyboardParser let value = selKeyboardParser
PrefMgr.shared.keyboardParser = value PrefMgr.shared.keyboardParser = value
switch value {
case 0:
if !IMKHelper.arrDynamicBasicKeyLayouts.contains(PrefMgr.shared.basicKeyboardLayout) {
PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ZhuyinBopomofo"
selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout
}
default:
if IMKHelper.arrDynamicBasicKeyLayouts.contains(PrefMgr.shared.basicKeyboardLayout) {
PrefMgr.shared.basicKeyboardLayout = "com.apple.keylayout.ABC"
selBasicKeyboardLayout = PrefMgr.shared.basicKeyboardLayout
}
}
} }
) { ) {
Group { Group {
@ -180,10 +168,6 @@ struct suiPrefPaneKeyboard: View {
selection: $selBasicKeyboardLayout.onChange { selection: $selBasicKeyboardLayout.onChange {
let value = selBasicKeyboardLayout let value = selBasicKeyboardLayout
PrefMgr.shared.basicKeyboardLayout = value PrefMgr.shared.basicKeyboardLayout = value
if IMKHelper.arrDynamicBasicKeyLayouts.contains(value) {
PrefMgr.shared.keyboardParser = 0
selKeyboardParser = PrefMgr.shared.keyboardParser
}
} }
) { ) {
ForEach(0...(IMKHelper.allowedBasicLayoutsAsTISInputSources.count - 1), id: \.self) { id in ForEach(0...(IMKHelper.allowedBasicLayoutsAsTISInputSources.count - 1), id: \.self) { id in