Merge pull request #453 from manaflow-ai/cmux/cmd-n-browser

Fix Cmd+N workspace shortcut when browser panel is focused
This commit is contained in:
Austin Wang 2026-02-24 16:38:02 -08:00 committed by GitHub
commit 7a4d986d85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2984,7 +2984,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
private func shortcutEventHasAddressableWindow(_ event: NSEvent?) -> Bool {
guard let event else { return false }
return event.window != nil || event.windowNumber >= 0
// NSEvent.windowNumber can be 0 for responder-chain events that are not
// actually bound to an NSWindow (notably some WebKit key paths).
return event.window != nil || event.windowNumber > 0
}
private func mainWindowContext(
@ -3007,7 +3009,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
return context
}
if event.windowNumber >= 0,
if event.windowNumber > 0,
let numberedWindow = NSApp.window(withWindowNumber: event.windowNumber),
let context = contextForMainTerminalWindow(numberedWindow) {
#if DEBUG
@ -3022,7 +3024,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
return context
}
if event.windowNumber >= 0,
if event.windowNumber > 0,
let context = mainWindowContexts.values.first(where: { candidate in
let window = candidate.window ?? windowForMainWindowId(candidate.windowId)
return window?.windowNumber == event.windowNumber