Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f55861be7 | ||
|
|
ccc172d218 | ||
|
|
4bc6b333dc | ||
|
|
abb0b548bf | ||
|
|
8d795d0a28 |
@@ -142,8 +142,8 @@ preferred position controls where the hidden/kept boundary lands:
|
||||
menu is its own window anchored at the item's on-screen spot, so it survives
|
||||
re-hiding.
|
||||
- `press` first calls `onWillPress`, which `AppDelegate` wires to close the
|
||||
popover. Without it the panel stays open on top of the menu that opens and can
|
||||
leave menus (e.g. Spotlight) stranded behind it.
|
||||
popover **and** `NSApp.deactivate()`. Closing alone left our app frontmost, so
|
||||
transient items (Spotlight's search field) still would not appear.
|
||||
- **Cannot reveal a single icon.** The spacer hides a contiguous block to its
|
||||
left, so a press can only reveal the whole block. Isolating one item would
|
||||
need either per-item ordering control (not available) or covering the icons
|
||||
|
||||
@@ -34,14 +34,12 @@ automatically.
|
||||
|
||||
What it can and cannot hide:
|
||||
|
||||
- It hides **other third-party apps' icons** (cmux, Kapture, WireGuard, input
|
||||
source, Now Playing, …) so only your apps' icons leave the bar.
|
||||
- It **keeps Wi-Fi, Spotlight, Clock, Battery and Control Center**. The spacer's
|
||||
boundary is tuned (preferred position 250) to fall just left of Wi-Fi, so the
|
||||
Apple items on the right stay visible. macOS reserves that far-right area: a
|
||||
third-party item can never be placed to the right of it, so those icons cannot
|
||||
be pushed away even in principle. (Bartender and Ice hit the same wall and
|
||||
cover the area with their own overlay bar instead.)
|
||||
- It hides **other third-party apps' icons** (cmux, Kapture, moomoo, WireGuard).
|
||||
- It **keeps Wi-Fi, Now Playing, the input-source indicator, Spotlight, Clock,
|
||||
Battery and Control Center** visible, with the **hamburger at the left edge of
|
||||
that group**. The spacer's boundary (preferred position 330) falls just left
|
||||
of the input-source indicator. macOS reserves the far-right area, so an item
|
||||
can never be placed to the right of the system icons.
|
||||
- Newly launched apps are placed to the left of the spacer, so they are hidden
|
||||
automatically.
|
||||
- Advanced: set `defaults write dev.tzgyn.simpletopbar debug.spacerPos -float <n>`
|
||||
|
||||
@@ -103,9 +103,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
let name = "SimpleTopBar"
|
||||
let positionKey = "NSStatusItem Preferred Position \(name)"
|
||||
// Only seed the position on first run so the user's own drag wins and
|
||||
// persists through the autosave name.
|
||||
if UserDefaults.standard.object(forKey: positionKey) == nil {
|
||||
UserDefaults.standard.set(100.0, forKey: positionKey)
|
||||
// persists through the autosave name. Kept just below the hider's
|
||||
// preferred position so the hamburger lands at the left edge of the
|
||||
// visible icons. `debug.hamburgerPos` overrides it.
|
||||
if let override = UserDefaults.standard.object(forKey: "debug.hamburgerPos") as? Double {
|
||||
UserDefaults.standard.set(override, forKey: positionKey)
|
||||
} else if UserDefaults.standard.object(forKey: positionKey) == nil {
|
||||
UserDefaults.standard.set(320.0, forKey: positionKey)
|
||||
}
|
||||
|
||||
let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||
@@ -133,11 +137,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
)
|
||||
self.popover = popover
|
||||
|
||||
// Selecting a tray item must dismiss our panel, otherwise it stays on
|
||||
// top of the menu that opens (and can strand menus behind it).
|
||||
// Selecting a tray item must dismiss our panel and give up focus,
|
||||
// otherwise the panel stays on top of the menu and our app stays
|
||||
// frontmost, which stops transient items (Spotlight's search field)
|
||||
// from appearing at all.
|
||||
Task { @MainActor [weak self] in
|
||||
MenuBarItemManager.shared.onWillPress = {
|
||||
self?.popover?.performClose(nil)
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
|
||||
NSApp.deactivate()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ struct MenuBarItem: Identifiable, Equatable {
|
||||
let icon: NSImage
|
||||
/// True for Apple's own items (Control Center, Spotlight, …).
|
||||
let isSystem: Bool
|
||||
/// Frame in Accessibility coordinates (origin top-left of the main screen).
|
||||
let frame: CGRect?
|
||||
let element: AXUIElement
|
||||
|
||||
static func == (lhs: MenuBarItem, rhs: MenuBarItem) -> Bool {
|
||||
@@ -75,10 +77,11 @@ final class MenuBarItemManager: ObservableObject {
|
||||
|
||||
var seenTitles = Set<String>()
|
||||
for (index, child) in children.enumerated() {
|
||||
let position = pointAttribute(child, kAXPositionAttribute)
|
||||
// Control Center reports every module it owns, including the
|
||||
// ones not in the menu bar, which are parked off-screen around
|
||||
// y=982. Keep only items actually sitting in the bar.
|
||||
if let position = pointAttribute(child, kAXPositionAttribute), position.y > 60 {
|
||||
if let position, position.y > 60 {
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -90,6 +93,14 @@ final class MenuBarItemManager: ObservableObject {
|
||||
// "Control Center"; show each distinct title once per app.
|
||||
if !seenTitles.insert(title).inserted { continue }
|
||||
|
||||
let size = sizeAttribute(child, kAXSizeAttribute)
|
||||
let frame: CGRect?
|
||||
if let position, let size {
|
||||
frame = CGRect(origin: position, size: size)
|
||||
} else {
|
||||
frame = nil
|
||||
}
|
||||
|
||||
found.append(MenuBarItem(
|
||||
id: "\(pid)-\(index)",
|
||||
pid: pid,
|
||||
@@ -97,6 +108,7 @@ final class MenuBarItemManager: ObservableObject {
|
||||
title: title,
|
||||
icon: Self.icon(forTitle: title, app: app),
|
||||
isSystem: Self.isSystemBundle(app.bundleIdentifier),
|
||||
frame: frame,
|
||||
element: child
|
||||
))
|
||||
}
|
||||
@@ -127,23 +139,38 @@ final class MenuBarItemManager: ObservableObject {
|
||||
return
|
||||
}
|
||||
hider.suspend()
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
|
||||
_ = self.performPress(item)
|
||||
// The menu is its own window, positioned at the item's on-screen
|
||||
// spot, so the bar can be re-hidden almost immediately.
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
|
||||
// spot, so the bar can be re-hidden shortly after.
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
|
||||
hider.resume()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func performPress(_ item: MenuBarItem) -> Bool {
|
||||
// Spotlight's status item accepts the accessibility press action but
|
||||
// does nothing with it; it needs a genuine click.
|
||||
if item.appName.lowercased().contains("spotlight"), let frame = item.frame {
|
||||
postClick(at: CGPoint(x: frame.midX, y: frame.midY))
|
||||
return true
|
||||
}
|
||||
if AXUIElementPerformAction(item.element, kAXPressAction as CFString) == .success {
|
||||
return true
|
||||
}
|
||||
return AXUIElementPerformAction(item.element, kAXShowMenuAction as CFString) == .success
|
||||
}
|
||||
|
||||
/// Posts a real left click at a point in Accessibility/global coordinates.
|
||||
private func postClick(at point: CGPoint) {
|
||||
let source = CGEventSource(stateID: .hidSystemState)
|
||||
let down = CGEvent(mouseEventSource: source, mouseType: .leftMouseDown, mouseCursorPosition: point, mouseButton: .left)
|
||||
let up = CGEvent(mouseEventSource: source, mouseType: .leftMouseUp, mouseCursorPosition: point, mouseButton: .left)
|
||||
down?.post(tap: .cghidEventTap)
|
||||
up?.post(tap: .cghidEventTap)
|
||||
}
|
||||
|
||||
// MARK: - Classification
|
||||
|
||||
/// Apple's own menu bar items (Control Center, Spotlight, the input-source
|
||||
@@ -235,6 +262,16 @@ final class MenuBarItemManager: ObservableObject {
|
||||
guard AXValueGetValue(value as! AXValue, .cgPoint, &point) else { return nil }
|
||||
return point
|
||||
}
|
||||
|
||||
nonisolated static func sizeAttribute(_ element: AXUIElement, _ attribute: String) -> CGSize? {
|
||||
var value: CFTypeRef?
|
||||
guard AXUIElementCopyAttributeValue(element, attribute as CFString, &value) == .success,
|
||||
let value,
|
||||
CFGetTypeID(value) == AXValueGetTypeID() else { return nil }
|
||||
var size = CGSize.zero
|
||||
guard AXValueGetValue(value as! AXValue, .cgSize, &size) else { return nil }
|
||||
return size
|
||||
}
|
||||
}
|
||||
|
||||
/// Best-effort menu bar item hiding. A zero-width spacer status item is created
|
||||
@@ -276,10 +313,15 @@ final class MenuBarHider: ObservableObject {
|
||||
// The boundary between "hidden" and "kept" falls just left of Wi-Fi at
|
||||
// ~250, so the other apps hide while Apple's Wi-Fi/Clock/Battery/Control
|
||||
// Center/Spotlight stay visible. `debug.spacerPos` overrides the seed.
|
||||
// The boundary sits just left of the input-source indicator, so every
|
||||
// system item (input source, Now Playing, Wi-Fi, …) stays visible while
|
||||
// the apps hide. It must stay *above* the hamburger's preferred position
|
||||
// (see AppDelegate) for the hamburger to remain on the visible side.
|
||||
// `debug.spacerPos` overrides the seed.
|
||||
if let override = UserDefaults.standard.object(forKey: "debug.spacerPos") as? Double {
|
||||
UserDefaults.standard.set(override, forKey: key)
|
||||
} else if UserDefaults.standard.object(forKey: key) == nil {
|
||||
UserDefaults.standard.set(250.0, forKey: key)
|
||||
UserDefaults.standard.set(330.0, forKey: key)
|
||||
}
|
||||
let item = NSStatusBar.system.statusItem(withLength: 0)
|
||||
item.autosaveName = name
|
||||
|
||||
@@ -103,9 +103,9 @@ func runSelfTest() {
|
||||
check(MenuBarItemManager.children(of: systemWide) == nil, "no children on a non-app element")
|
||||
|
||||
let element = AXUIElementCreateSystemWide()
|
||||
let first = MenuBarItem(id: "1-0", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, element: element)
|
||||
let same = MenuBarItem(id: "1-0", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, element: element)
|
||||
let different = MenuBarItem(id: "1-1", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, element: element)
|
||||
let first = MenuBarItem(id: "1-0", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, frame: nil, element: element)
|
||||
let same = MenuBarItem(id: "1-0", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, frame: nil, element: element)
|
||||
let different = MenuBarItem(id: "1-1", pid: 1, appName: "A", title: "T", icon: NSImage(), isSystem: false, frame: nil, element: element)
|
||||
check(first == same, "menu bar items compare by id and title")
|
||||
check(first != different, "different ids are not equal")
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ struct TopBarView: View {
|
||||
.controlSize(.mini)
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.top, 6)
|
||||
.help("Best-effort: pushes other apps' icons off the menu bar so they only live here. Apple's Wi-Fi, Spotlight, Clock, Battery and Control Center stay visible; macOS won't let any third-party app move them.")
|
||||
.help("Best-effort: pushes other apps' icons off the menu bar so they only live here. Apple's system items (Wi-Fi, Now Playing, Clock, Battery, Control Center, Spotlight) stay visible; macOS won't let any third-party app move them.")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
VERSION="${1:-0.4.3}"
|
||||
VERSION="${1:-0.4.7}"
|
||||
|
||||
swift build -c release
|
||||
|
||||
|
||||
Reference in New Issue
Block a user