Skip to content

Right-sidebar mode shortcuts do nothing when the key view briefly clears #8599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ejc3 wants to merge 1 commit into from
Closed

Right-sidebar mode shortcuts do nothing when the key view briefly clears #8599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6837,7 +6837,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
func shouldRouteRightSidebarModeShortcut(in window: NSWindow?) -> Bool {
guard let window else { return false }
let sidebarIntentActive = keyboardFocusCoordinator(for: window)?.activeRightSidebarMode != nil
guard let responder = window.firstResponder else { return sidebarIntentActive }
// makeFirstResponder(nil) parks firstResponder on the window itself, so responder === window
// means there is no real responder, so treat it like nil and route on the active sidebar intent.
guard let responder = window.firstResponder, responder !== window else { return sidebarIntentActive }
if isRightSidebarFocusResponder(responder, in: window) { return true }
if sidebarIntentActive, responder is NSWindow { return true }
if terminalKeyboardFocusRequest(for: responder) != nil { return false }
Expand Down