maxsoch/BrewBar
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'window-activation': windows front and center, Cmd-Tab entry while open

Browse source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
maxsoch 2026-07-07 06:06:20 +02:00
parent 25e4476317 59683ee8a9
commit ecb6728f42
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
BrewBar/BrewBarApp.swift
View file

@ -48,6 +48,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(_: Notification) {
Settings.registerDefaults()
NotificationCenter.default.addObserver(
self,
selector: #selector(windowWillClose(_:)),
name: NSWindow.willCloseNotification,
object: nil
)
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
statusItem.button?.imagePosition = .imageLeft // icon stays visible next to the count
setMenuBarIcon("brewbar-uptodate")
@ -117,10 +124,31 @@ class AppDelegate: NSObject, NSApplicationDelegate {
settingsWindow = SettingsWindowController(appDelegate: self)
}
settingsWindow?.syncUI()
settingsWindow?.showWindow(nil)
// accessory app: without activation the window can open behind others
presentWindow(of: settingsWindow)
}
// MARK: - Window presentation
/// Accessory apps never appear in Cmd-Tab and their windows can open
/// behind other apps. While one of our windows is open we temporarily
/// become a regular app (Dock icon + Cmd-Tab entry); windowWillClose
/// drops back to accessory once the last window is gone.
func presentWindow(of controller: NSWindowController?) {
NSApp.setActivationPolicy(.regular)
controller?.showWindow(nil)
NSApp.activate(ignoringOtherApps: true)
settingsWindow?.window?.makeKeyAndOrderFront(nil)
controller?.window?.makeKeyAndOrderFront(nil)
}
@objc func windowWillClose(_: Notification) {
// async so the closing window's isVisible has flipped to false
DispatchQueue.main.async {
let ourWindows = [self.logWindow?.window, self.settingsWindow?.window]
let stillOpen = ourWindows.compactMap { $0 }.contains { $0.isVisible }
if !stillOpen {
NSApp.setActivationPolicy(.accessory)
}
}
}
func resolveBrewPath() -> String {
@ -433,7 +461,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
if logWindow == nil {
logWindow = LogWindowController()
}
logWindow?.showWindow(nil)
logWindow?.update(text: logBuffer)
presentWindow(of: logWindow)
}
}