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

ctlIME // Simplify "includeShift".

This commit is contained in:
ShikiSuen 2022-03-25 17:49:33 +08:00
parent 0a8f7428ed
commit e229fb49bf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Modules/IMEModules/ctlInputMethod.swift
View File

@ -195,13 +195,12 @@ class ctlInputMethod: IMKInputController {
// 同時注意：必須將 event.type == .flagsChanged 放在最外圍、且在其結尾插入 return false， // 同時注意：必須將 event.type == .flagsChanged 放在最外圍、且在其結尾插入 return false，
// 否則，每次處理這種判斷時都會觸發 NSInternalInconsistencyException。 // 否則，每次處理這種判斷時都會觸發 NSInternalInconsistencyException。
if (mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout) && (event.type == .flagsChanged) { if (mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout) && (event.type == .flagsChanged) {
let includeShift = mgrPrefs.functionKeyKeyboardLayoutOverrideIncludeShiftKey
if (event.modifierFlags == .capsLock || if (event.modifierFlags == .capsLock ||
event.modifierFlags.contains(.command) || event.modifierFlags.contains(.command) ||
event.modifierFlags.contains(.option) || event.modifierFlags.contains(.option) ||
event.modifierFlags.contains(.control) || event.modifierFlags.contains(.control) ||
event.modifierFlags.contains(.function) || event.modifierFlags.contains(.function) ||
(event.modifierFlags.contains(.shift) && includeShift)) { (event.modifierFlags.contains(.shift) && mgrPrefs.functionKeyKeyboardLayoutOverrideIncludeShiftKey)) {
(client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.functionKeyboardLayout) (client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.functionKeyboardLayout)
} else { } else {
(client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.basisKeyboardLayout) (client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.basisKeyboardLayout)