From 9fd0c16d701b11a8013556ea6715c71a5a9be010 Mon Sep 17 00:00:00 2001 From: Phung Tuan Hoang Date: Mon, 20 Jan 2020 19:17:47 +0800 Subject: [PATCH] fix: touch bar's escape key works on mbp 15 2019 (closes #119) --- alt-tab-macos/logic/Keyboard.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/alt-tab-macos/logic/Keyboard.swift b/alt-tab-macos/logic/Keyboard.swift index eef14de41..5b08cc828 100644 --- a/alt-tab-macos/logic/Keyboard.swift +++ b/alt-tab-macos/logic/Keyboard.swift @@ -48,7 +48,10 @@ func keyboardHandler(proxy: CGEventTapProxy, type: CGEventType, event_: CGEvent, let isRightArrow = event.keyCode == kVK_RightArrow let isLeftArrow = event.keyCode == kVK_LeftArrow 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) { return dispatchWork(application, true, { application.showUiOrCycleSelection(-1) }) } else if isTab { @@ -57,8 +60,6 @@ func keyboardHandler(proxy: CGEventTapProxy, type: CGEventType, event_: CGEvent, return dispatchWork(application, true, { application.cycleSelection(1) }) } else if isLeftArrow && application.appIsBeingUsed { return dispatchWork(application, true, { application.cycleSelection(-1) }) - } else if type == .keyDown && isEscape { - return dispatchWork(application, false, { application.hideUi() }) } } else if isMetaChanged && !isMetaDown { return dispatchWork(application, false, { application.focusTarget() })