fix: touch bar's escape key works on mbp 15 2019 (closes #119)
This commit is contained in:
1 parent
5b8a9110db
commit
eda6b7e9d9
1 file changed
+4
-3
@@ -48,7 +48,10 @@ func keyboardHandler(proxy: CGEventTapProxy, type: CGEventType, event_: CGEvent,
|
|||||||
let isRightArrow = event.keyCode == kVK_RightArrow
|
let isRightArrow = event.keyCode == kVK_RightArrow
|
||||||
let isLeftArrow = event.keyCode == kVK_LeftArrow
|
let isLeftArrow = event.keyCode == kVK_LeftArrow
|
||||||
let isEscape = event.keyCode == kVK_Escape
|
let isEscape = event.keyCode == kVK_Escape
|
||||||
if isMetaDown && type == .keyDown {
|
|
||||||
|
if type == .keyDown && isEscape {
|
||||||
|
return dispatchWork(application, false, { application.hideUi() })
|
||||||
|
} else if isMetaDown && type == .keyDown {
|
||||||
if isTab && event.modifierFlags.contains(.shift) {
|
if isTab && event.modifierFlags.contains(.shift) {
|
||||||
return dispatchWork(application, true, { application.showUiOrCycleSelection(-1) })
|
return dispatchWork(application, true, { application.showUiOrCycleSelection(-1) })
|
||||||
} else if isTab {
|
} else if isTab {
|
||||||
@@ -57,8 +60,6 @@ func keyboardHandler(proxy: CGEventTapProxy, type: CGEventType, event_: CGEvent,
|
|||||||
return dispatchWork(application, true, { application.cycleSelection(1) })
|
return dispatchWork(application, true, { application.cycleSelection(1) })
|
||||||
} else if isLeftArrow && application.appIsBeingUsed {
|
} else if isLeftArrow && application.appIsBeingUsed {
|
||||||
return dispatchWork(application, true, { application.cycleSelection(-1) })
|
return dispatchWork(application, true, { application.cycleSelection(-1) })
|
||||||
} else if type == .keyDown && isEscape {
|
|
||||||
return dispatchWork(application, false, { application.hideUi() })
|
|
||||||
}
|
}
|
||||||
} else if isMetaChanged && !isMetaDown {
|
} else if isMetaChanged && !isMetaDown {
|
||||||
return dispatchWork(application, false, { application.focusTarget() })
|
return dispatchWork(application, false, { application.focusTarget() })
|
||||||
|
|||||||
Reference in new issue
Block a user