From 8219189bf515d3858d083af8489bbd0f92ad61cf Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 11 Mar 2022 17:36:12 +0800 Subject: [PATCH] ctlIME // Revising the conditions of using functionKeyboardLayout. --- Source/Modules/IMEModules/ctlInputMethod.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift index 5ed0a757..5814d597 100644 --- a/Source/Modules/IMEModules/ctlInputMethod.swift +++ b/Source/Modules/IMEModules/ctlInputMethod.swift @@ -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