Skip to content

macos: when toggling visibility, hide individual windows not app #8636

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −25
Open

macos: when toggling visibility, hide individual windows not app #8636

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
57 changes: 32 additions & 25 deletions macos/Sources/App/macOS/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class AppDelegate: NSObject,
}

/// Tracks the windows that we hid for toggleVisibility.
private var hiddenState: ToggleVisibilityState? = nil
private var windowStash: HiddenWindowStash = HiddenWindowStash()

/// The observer for the app appearance.
private var appearanceObserver: NSKeyValueObservation? = nil
Expand Down Expand Up @@ -294,8 +294,8 @@ class AppDelegate: NSObject,
}

func applicationDidBecomeActive(_ notification: Notification) {
// If we're back manually then clear the hidden state because macOS handles it.
self.hiddenState = nil
// Restore hidden windows, because MacOS won't do it for us
windowStash.restoreAll()

// Clear the dock badge when the app becomes active
self.setDockBadge(nil)
Expand Down Expand Up @@ -1039,27 +1039,22 @@ class AppDelegate: NSObject,

/// Toggles visibility of all Ghosty Terminal windows. When hidden, activates Ghostty as the frontmost application
@IBAction func toggleVisibility(_ sender: Any) {
// If we have focus, then we hide all windows.
if NSApp.isActive {
if windowStash.hasHiddenWindows() {
// If we're not active, we want to become active
NSApp.activate(ignoringOtherApps: true)

windowStash.restoreAll()
} else {
// Toggle visibility doesn't do anything if the focused window is native
// fullscreen. This is only relevant if Ghostty is active.
guard let keyWindow = NSApp.keyWindow,
!keyWindow.styleMask.contains(.fullScreen) else { return }

// Keep track of our hidden state to restore properly
self.hiddenState = .init()
windowStash.hideAll()

// Deactivate the app, as we no longer have any visible windows
NSApp.hide(nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still seems to use NSApp.hide?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see how that's confusing. Windows are hidden with window.orderOut() in hideAll(), but we still need NSApp.hide(nil) to deactivate the app and bring whatever app was running behind Ghostty in the stack to the foreground.

return
}

// If we're not active, we want to become active
NSApp.activate(ignoringOtherApps: true)

// Bring all windows to the front. Note: we don't use NSApp.unhide because
// that will unhide ALL hidden windows. We want to only bring forward the
// ones that we hid.
hiddenState?.restore()
hiddenState = nil
}

@IBAction func bringAllToFront(_ sender: Any) {
Expand Down Expand Up @@ -1096,14 +1091,18 @@ class AppDelegate: NSObject,
}
}

private struct ToggleVisibilityState {
let hiddenWindows: [Weak<NSWindow>]
let keyWindow: Weak<NSWindow>?
private struct HiddenWindowStash {
private var hiddenWindows: [Weak<NSWindow>] = []
private var keyWindow: Weak<NSWindow>?

init() {
init() {}

func hasHiddenWindows() -> Bool { !hiddenWindows.isEmpty }

mutating func hideAll() {
// We need to know the key window so that we can bring focus back to the
// right window if it was hidden.
self.keyWindow = if let keyWindow = NSApp.keyWindow {
self.keyWindow = if let keyWindow = NSApp.keyWindow, !keyWindow.styleMask.contains(.nonactivatingPanel) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reasoning behind ignoring nonactivatingPanel. What does Ghostty have that triggers this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The quick terminal is a non-activating panel.

.init(keyWindow)
} else {
nil
Expand All @@ -1113,15 +1112,23 @@ class AppDelegate: NSObject,
// want to bring back these windows if we remove the toggle.
//
// We also ignore fullscreen windows because they don't hide anyways.
self.hiddenWindows = NSApp.windows.filter {
let windows = NSApp.windows.filter {
$0.isVisible &&
!$0.styleMask.contains(.nonactivatingPanel) &&
!$0.styleMask.contains(.fullScreen)
}.map { Weak($0) }
windows.forEach { $0.value?.orderOut(nil) }
hiddenWindows.append(contentsOf: windows)
}

func restore() {
mutating func restoreAll() {
hiddenWindows.forEach { $0.value?.orderFrontRegardless() }
keyWindow?.value?.makeKey()
if let keyWindow = self.keyWindow?.value ?? hiddenWindows.compactMap(\.value).last {
keyWindow.makeKeyAndOrderFront(nil)
}

hiddenWindows.removeAll()
keyWindow = nil
}
}
}
Expand Down