mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-17 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: fixup focus issues when closing the new window

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-12-29 10:36:17 -08:00
parent 29edbbbc86
commit 19f7b57cd1
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
macos/Sources/Features/Terminal/BaseTerminalController.swift
View File

@@ -734,8 +734,10 @@ class BaseTerminalController: NSWindowController,
// it is already a single split. // it is already a single split.
guard surfaceTree.isSplit else { return } guard surfaceTree.isSplit else { return }
// Extract the drop position from the notification // If we are removing our focused surface then we move it.
let dropPoint = notification.userInfo?[Notification.Name.ghosttySurfaceDragEndedNoTargetPointKey] as? NSPoint if focusedSurface == target {
focusedSurface = findNextFocusTargetAfterClosing(node: targetNode)
}
// Remove the surface from our tree // Remove the surface from our tree
let removedTree = surfaceTree.remove(targetNode) let removedTree = surfaceTree.remove(targetNode)
@@ -751,7 +753,10 @@ class BaseTerminalController: NSWindowController,
} }
replaceSurfaceTree(removedTree, moveFocusFrom: focusedSurface) replaceSurfaceTree(removedTree, moveFocusFrom: focusedSurface)
_ = TerminalController.newWindow(ghostty, tree: newTree, position: dropPoint) _ = TerminalController.newWindow(
ghostty,
tree: newTree,
position: notification.userInfo?[Notification.Name.ghosttySurfaceDragEndedNoTargetPointKey] as? NSPoint)
} }
// MARK: Local Events // MARK: Local Events
@@ -1205,6 +1210,15 @@ class BaseTerminalController: NSWindowController,
} }
func windowDidBecomeKey(_ notification: Notification) { func windowDidBecomeKey(_ notification: Notification) {
// If when we become key our first responder is the window itself, then we
// want to move focus to our focused terminal surface. This works around
// various weirdness with moving surfaces around.
if let window, window.firstResponder == window, let focusedSurface {
DispatchQueue.main.async {
Ghostty.moveFocus(to: focusedSurface)
}
}
// Becoming/losing key means we have to notify our surface(s) that we have focus // Becoming/losing key means we have to notify our surface(s) that we have focus
// so things like cursors blink, pty events are sent, etc. // so things like cursors blink, pty events are sent, etc.
self.syncFocusToSurfaceTree() self.syncFocusToSurfaceTree()