SessionCtl // Removing shiftKeyAccommodationBehavior.

This commit is contained in:
ShikiSuen 2023-01-24 17:43:10 +08:00
parent 72560e82e2
commit e49d60447c
1 changed files with 7 additions and 17 deletions

View File

@ -60,6 +60,7 @@ extension SessionCtl {
} }
} }
//
func toggleAlphanumericalMode() { func toggleAlphanumericalMode() {
let status = "NotificationSwitchASCII".localized let status = "NotificationSwitchASCII".localized
Notifier.notify( Notifier.notify(
@ -70,25 +71,14 @@ extension SessionCtl {
} }
// Shift macOS 10.15 macOS // Shift macOS 10.15 macOS
let shouldUseShiftToggleHandle: Bool = { // event event var Shift
switch PrefMgr.shared.shiftKeyAccommodationBehavior {
case 0: return false
case 1: return Shared.arrClientShiftHandlingExceptionList.contains(clientBundleIdentifier)
case 2: return true
default: return false
}
}()
/// event event var Shift
if #available(macOS 10.15, *) { if #available(macOS 10.15, *) {
if Self.theShiftKeyDetector.check(event), !PrefMgr.shared.disableShiftTogglingAlphanumericalMode { if Self.theShiftKeyDetector.check(event), !PrefMgr.shared.disableShiftTogglingAlphanumericalMode {
if shouldUseShiftToggleHandle {
if !rencentKeyHandledByInputHandlerEtc { if !rencentKeyHandledByInputHandlerEtc {
toggleAlphanumericalMode() toggleAlphanumericalMode()
} else { } else {
rencentKeyHandledByInputHandlerEtc = false rencentKeyHandledByInputHandlerEtc = false
} }
}
return true return true
} }
} }
@ -160,7 +150,7 @@ extension SessionCtl {
/// commonEventHandler /// commonEventHandler
let result = inputHandler.handleEvent(eventToDeal) let result = inputHandler.handleEvent(eventToDeal)
if shouldUseShiftToggleHandle { rencentKeyHandledByInputHandlerEtc = result } rencentKeyHandledByInputHandlerEtc = result
if !result { if !result {
// .ofMarking // .ofMarking
if [.ofEmpty].contains(state.type) { tooltipInstance.hide() } if [.ofEmpty].contains(state.type) { tooltipInstance.hide() }