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: ensure quick terminal becomes key and focused after animation in

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-09-29 10:44:01 -07:00
parent 99a1dbdf46
commit 83505bb4c0
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,12 @@ class QuickTerminalController: BaseTerminalController {
guard !visible else { return }
visible = true
// If our application is not active, then we grab focus. The quick terminal
// always grabs focus on animation in.
if !NSApp.isActive {
NSApp.activate(ignoringOtherApps: true)
}
// Animate the window in
animateWindowIn(window: window, from: position)
@ -110,16 +116,6 @@ class QuickTerminalController: BaseTerminalController {
let leaf: Ghostty.SplitNode.Leaf = .init(ghostty.app!, baseConfig: nil)
surfaceTree = .leaf(leaf)
focusedSurface = leaf.surface
// We need to grab first responder but it takes a few loop cycles
// before the view is attached to the window so we do it async.
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(250)) {
// We should probably retry here but I was never able to trigger this.
// If this happens though its a crash so let's avoid it.
guard let leafWindow = leaf.surface.window,
leafWindow == window else { return }
window.makeFirstResponder(leaf.surface)
}
}
}
@ -136,12 +132,6 @@ class QuickTerminalController: BaseTerminalController {
private func animateWindowIn(window: NSWindow, from position: QuickTerminalPosition) {
guard let screen = ghostty.config.quickTerminalScreen.screen else { return }
// If our application is not active, then we grab focus. The quick terminal
// always grabs focus.
if !NSApp.isActive {
NSApp.activate(ignoringOtherApps: true)
}
// Move our window off screen to the top
position.setInitial(in: window, on: screen)
@ -150,11 +140,26 @@ class QuickTerminalController: BaseTerminalController {
// Run the animation that moves our window into the proper place and makes
// it visible.
NSAnimationContext.runAnimationGroup { context in
NSAnimationContext.runAnimationGroup({ context in
context.duration = 0.2
context.timingFunction = .init(name: .easeIn)
position.setFinal(in: window.animator(), on: screen)
}
}, completionHandler: {
// If we canceled our animation in we do nothing
guard self.visible else { return }
// If our focused view is somehow not connected to this window then the
// function calls below do nothing. I don't think this is possible but
// we should guard against it because it is a Cocoa assertion.
guard let focusedView = self.focusedSurface,
focusedView.window == window else { return }
// The window must become top-level
window.makeKeyAndOrderFront(self)
// The view must gain our keyboard focus
window.makeFirstResponder(focusedView)
})
}
private func animateWindowOut(window: NSWindow, to position: QuickTerminalPosition) {