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

ctlIME // Use another keylayout if Shift-Alphanumerical mode is ON.

This commit is contained in:
ShikiSuen 2022-09-12 17:39:30 +08:00
parent 5a16d6d638
commit ece124d05d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Modules/ControllerModules/ctlInputMethod_Core.swift
View File

@ -42,7 +42,7 @@ class ctlInputMethod: IMKInputController {
/// 當前這個 ctlInputMethod 副本是否處於縱排選字窗模式（滯後項）。 /// 當前這個 ctlInputMethod 副本是否處於縱排選字窗模式（滯後項）。
static var isVerticalCandidateSituation: Bool = false static var isVerticalCandidateSituation: Bool = false
/// 當前這個 ctlInputMethod 副本是否處於英數輸入模式。 /// 當前這個 ctlInputMethod 副本是否處於英數輸入模式。
var isASCIIMode: Bool = false var isASCIIMode: Bool = false { didSet { setKeyLayout() } }
/// 按鍵調度模組的副本。 /// 按鍵調度模組的副本。
var keyHandler: KeyHandler = .init() var keyHandler: KeyHandler = .init()
/// 用以記錄當前輸入法狀態的變數。 /// 用以記錄當前輸入法狀態的變數。
@ -66,9 +66,12 @@ class ctlInputMethod: IMKInputController {
/// 指定鍵盤佈局。 /// 指定鍵盤佈局。
func setKeyLayout() { func setKeyLayout() {
if let client = client() { guard let client = client() else { return }
client.overrideKeyboard(withKeyboardNamed: mgrPrefs.basicKeyboardLayout) if isASCIIMode, AppleKeyboardConverter.isDynamicBasicKeyboardLayoutEnabled {
client.overrideKeyboard(withKeyboardNamed: mgrPrefs.alphanumericalKeyboardLayout)
return
} }
client.overrideKeyboard(withKeyboardNamed: mgrPrefs.basicKeyboardLayout)
} }
/// 重設按鍵調度模組，會將當前尚未遞交的內容遞交出去。 /// 重設按鍵調度模組，會將當前尚未遞交的內容遞交出去。