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

ctlIME // Revising the conditions of using functionKeyboardLayout.

This commit is contained in:
ShikiSuen 2022-03-11 17:36:12 +08:00
parent 690a585de1
commit 8219189bf5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,10 +196,11 @@ class ctlInputMethod: IMKInputController {
}
let includeShift = Preferences.functionKeyKeyboardLayoutOverrideIncludeShiftKey
let notShift = NSEvent.ModifierFlags(rawValue: ~(NSEvent.ModifierFlags.shift.rawValue))
if event.modifierFlags.contains(notShift) ||
event.modifierFlags.contains(.capsLock) ||
if event.modifierFlags.contains(.capsLock) ||
event.modifierFlags.contains(.option) ||
event.modifierFlags.contains(.control) ||
event.modifierFlags.contains(.function) ||
(event.modifierFlags.contains(.shift) && includeShift) {
(client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: functionKeyKeyboardLayoutID)
return false