Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: quick terminal close focuses next window on same screen/space

Browse Source 
Previously, we'd find the next Ghostty window anywhere. Now we find the
one on the same screen/space to avoid moving the focus to a different screen.
This commit is contained in:
Mitchell Hashimoto
2024-09-29 14:04:48 -07:00
parent 83505bb4c0
commit c8a40a7791
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
View File

@ -177,13 +177,24 @@ class QuickTerminalController: BaseTerminalController {
position.setInitial(in: window.animator(), on: screen) position.setInitial(in: window.animator(), on: screen)
}, completionHandler: { }, completionHandler: {
guard wasKey else { return } guard wasKey else { return }
self.focusNextWindow() self.focusNextWindow(on: screen)
}) })
} }
private func focusNextWindow() { private func focusNextWindow(on screen: NSScreen) {
// We only want to consider windows that are visible let windows = NSApp.windows.filter {
let windows = NSApp.windows.filter { $0.isVisible } // Visible, otherwise we'll make an invisible window visible.
guard $0.isVisible else { return false }
// Same screen, just a preference...
guard $0.screen == screen else { return false }
// Same space (virtual screen). Otherwise we'll force an animation to
// another space which is very jarring.
guard $0.isOnActiveSpace else { return false }
return true
}
// If we have no windows there is nothing to focus. // If we have no windows there is nothing to focus.
guard !windows.isEmpty else { return } guard !windows.isEmpty else { return }