Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2340 from ghostty-org/push-tspxklnxtxpp

Browse Source 
macos: quick terminal app activation tweaks to avoid bringing up other windows
This commit is contained in:
Mitchell Hashimoto
2024-09-30 20:49:10 -07:00
committed by GitHub
parent 3eb2e5f0f0 7a5a9c2a58
commit 1cc79c5e76
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,18 +118,14 @@ class QuickTerminalController: BaseTerminalController {
guard !visible else { return } guard !visible else { return }
visible = true visible = true
// If our application is not active, then we grab focus. The quick terminal
// always grabs focus on animation in.
if !NSApp.isActive {
// If we have a previously focused application and it isn't us, then // If we have a previously focused application and it isn't us, then
// we want to store it so we can restore state later. // we want to store it so we can restore state later.
if !NSApp.isActive {
if let previousApp = NSWorkspace.shared.frontmostApplication, if let previousApp = NSWorkspace.shared.frontmostApplication,
previousApp.bundleIdentifier != Bundle.main.bundleIdentifier previousApp.bundleIdentifier != Bundle.main.bundleIdentifier
{ {
self.previousApp = previousApp self.previousApp = previousApp
} }
NSApp.activate(ignoringOtherApps: true)
} }
// Animate the window in // Animate the window in
@ -162,7 +158,7 @@ class QuickTerminalController: BaseTerminalController {
position.setInitial(in: window, on: screen) position.setInitial(in: window, on: screen)
// Move it to the visible position since animation requires this // Move it to the visible position since animation requires this
window.makeKeyAndOrderFront(self) window.makeKeyAndOrderFront(nil)
// Run the animation that moves our window into the proper place and makes // Run the animation that moves our window into the proper place and makes
// it visible. // it visible.
@ -184,10 +180,17 @@ class QuickTerminalController: BaseTerminalController {
focusedView.window == window else { return } focusedView.window == window else { return }
// The window must become top-level // The window must become top-level
window.makeKeyAndOrderFront(self) window.makeKeyAndOrderFront(nil)
// The view must gain our keyboard focus // The view must gain our keyboard focus
window.makeFirstResponder(focusedView) window.makeFirstResponder(focusedView)
// If our application is not active, then we grab focus. Its important
// we do this AFTER our window is animated in and focused because
// otherwise macOS will bring forward another window.
if !NSApp.isActive {
NSApp.activate(ignoringOtherApps: true)
}
} }
}) })
} }
@ -196,6 +199,19 @@ class QuickTerminalController: BaseTerminalController {
// We always animate out to whatever screen the window is actually on. // We always animate out to whatever screen the window is actually on.
guard let screen = window.screen ?? NSScreen.main else { return } guard let screen = window.screen ?? NSScreen.main else { return }
// If we have a previously active application, restore focus to it. We
// do this BEFORE the animation below because when the animation completes
// macOS will bring forward another window.
if let previousApp = self.previousApp {
// Make sure we unset the state no matter what
self.previousApp = nil
if !previousApp.isTerminated {
// Ignore the result, it doesn't change our behavior.
_ = previousApp.activate(options: [])
}
}
NSAnimationContext.runAnimationGroup({ context in NSAnimationContext.runAnimationGroup({ context in
context.duration = 0.2 context.duration = 0.2
context.timingFunction = .init(name: .easeIn) context.timingFunction = .init(name: .easeIn)
@ -204,18 +220,6 @@ class QuickTerminalController: BaseTerminalController {
// This causes the window to be removed from the screen list and macOS // This causes the window to be removed from the screen list and macOS
// handles what should be focused next. // handles what should be focused next.
window.orderOut(self) window.orderOut(self)
// If we have a previously active application, restore focus to it.
if let previousApp = self.previousApp {
// Make sure we unset the state no matter what
self.previousApp = nil
// If the app is terminated to nothing
guard !previousApp.isTerminated else { return }
// Ignore the result, it doesn't change our behavior.
_ = previousApp.activate(options: [])
}
}) })
} }