Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30d5aff906 | ||
|
|
6f55861be7 | ||
|
|
ccc172d218 | ||
|
|
4bc6b333dc | ||
|
|
abb0b548bf | ||
|
|
8d795d0a28 | ||
|
|
e465acba12 |
@@ -103,6 +103,13 @@ wants it in the final answer every time. Keep it to the cask upgrade commands
|
|||||||
(see the README release section for the exact block), because the app is
|
(see the README release section for the exact block), because the app is
|
||||||
installed through the tap.
|
installed through the tap.
|
||||||
|
|
||||||
|
Notarization: `release.sh` submits to Apple when the `SIMPLETOPBAR_NOTARY_*`
|
||||||
|
env vars are set (provider, `.p8` path, key id, issuer id). The credentials are
|
||||||
|
the same App Store Connect key used by Kapture (`~/.config/kapture/AuthKey_*.p8`,
|
||||||
|
team `RX6767S6BW`); the issuer id is a non-secret UUID from App Store Connect.
|
||||||
|
Verify with `spctl -a -vv SimpleTopBar.app` → `source=Notarized Developer ID`.
|
||||||
|
Without the vars it still builds, zips and prints the sha, just unnotarized.
|
||||||
|
|
||||||
## Status item placement (why not MenuBarExtra)
|
## Status item placement (why not MenuBarExtra)
|
||||||
|
|
||||||
On a full menu bar, a newly created status item is placed leftmost, which on a
|
On a full menu bar, a newly created status item is placed leftmost, which on a
|
||||||
@@ -141,6 +148,9 @@ preferred position controls where the hidden/kept boundary lands:
|
|||||||
(`kAXPressAction`, then `kAXShowMenuAction`), and `resume()`s ~0.1s later. The
|
(`kAXPressAction`, then `kAXShowMenuAction`), and `resume()`s ~0.1s later. The
|
||||||
menu is its own window anchored at the item's on-screen spot, so it survives
|
menu is its own window anchored at the item's on-screen spot, so it survives
|
||||||
re-hiding.
|
re-hiding.
|
||||||
|
- `press` first calls `onWillPress`, which `AppDelegate` wires to close the
|
||||||
|
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
|
- **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
|
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
|
need either per-item ordering control (not available) or covering the icons
|
||||||
|
|||||||
@@ -34,14 +34,12 @@ automatically.
|
|||||||
|
|
||||||
What it can and cannot hide:
|
What it can and cannot hide:
|
||||||
|
|
||||||
- It hides **other third-party apps' icons** (cmux, Kapture, WireGuard, input
|
- It hides **other third-party apps' icons** (cmux, Kapture, moomoo, WireGuard).
|
||||||
source, Now Playing, …) so only your apps' icons leave the bar.
|
- It **keeps Wi-Fi, Now Playing, the input-source indicator, Spotlight, Clock,
|
||||||
- It **keeps Wi-Fi, Spotlight, Clock, Battery and Control Center**. The spacer's
|
Battery and Control Center** visible, with the **hamburger at the left edge of
|
||||||
boundary is tuned (preferred position 250) to fall just left of Wi-Fi, so the
|
that group**. The spacer's boundary (preferred position 330) falls just left
|
||||||
Apple items on the right stay visible. macOS reserves that far-right area: a
|
of the input-source indicator. macOS reserves the far-right area, so an item
|
||||||
third-party item can never be placed to the right of it, so those icons cannot
|
can never be placed to the right of the system icons.
|
||||||
be pushed away even in principle. (Bartender and Ice hit the same wall and
|
|
||||||
cover the area with their own overlay bar instead.)
|
|
||||||
- Newly launched apps are placed to the left of the spacer, so they are hidden
|
- Newly launched apps are placed to the left of the spacer, so they are hidden
|
||||||
automatically.
|
automatically.
|
||||||
- Advanced: set `defaults write dev.tzgyn.simpletopbar debug.spacerPos -float <n>`
|
- Advanced: set `defaults write dev.tzgyn.simpletopbar debug.spacerPos -float <n>`
|
||||||
@@ -57,7 +55,8 @@ brew install --cask simpletopbar
|
|||||||
```
|
```
|
||||||
|
|
||||||
The tap is hosted on Gitea, so the full URL is required. Homebrew may print an
|
The tap is hosted on Gitea, so the full URL is required. Homebrew may print an
|
||||||
"Unsupported tap" warning — it's harmless.
|
"Unsupported tap" warning — it's harmless. Releases from 0.4.8 on are notarized,
|
||||||
|
so the app opens without a Gatekeeper warning.
|
||||||
|
|
||||||
## Upgrade
|
## Upgrade
|
||||||
|
|
||||||
|
|||||||
@@ -103,9 +103,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
let name = "SimpleTopBar"
|
let name = "SimpleTopBar"
|
||||||
let positionKey = "NSStatusItem Preferred Position \(name)"
|
let positionKey = "NSStatusItem Preferred Position \(name)"
|
||||||
// Only seed the position on first run so the user's own drag wins and
|
// Only seed the position on first run so the user's own drag wins and
|
||||||
// persists through the autosave name.
|
// persists through the autosave name. Kept just below the hider's
|
||||||
if UserDefaults.standard.object(forKey: positionKey) == nil {
|
// preferred position so the hamburger lands at the left edge of the
|
||||||
UserDefaults.standard.set(100.0, forKey: positionKey)
|
// 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)
|
let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||||
@@ -132,6 +136,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.popover = popover
|
self.popover = popover
|
||||||
|
|
||||||
|
// 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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc private func togglePopover() {
|
@objc private func togglePopover() {
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ struct MenuBarItem: Identifiable, Equatable {
|
|||||||
let icon: NSImage
|
let icon: NSImage
|
||||||
/// True for Apple's own items (Control Center, Spotlight, …).
|
/// True for Apple's own items (Control Center, Spotlight, …).
|
||||||
let isSystem: Bool
|
let isSystem: Bool
|
||||||
|
/// Frame in Accessibility coordinates (origin top-left of the main screen).
|
||||||
|
let frame: CGRect?
|
||||||
let element: AXUIElement
|
let element: AXUIElement
|
||||||
|
|
||||||
static func == (lhs: MenuBarItem, rhs: MenuBarItem) -> Bool {
|
static func == (lhs: MenuBarItem, rhs: MenuBarItem) -> Bool {
|
||||||
@@ -30,6 +32,9 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
|
|
||||||
private var observers: [NSObjectProtocol] = []
|
private var observers: [NSObjectProtocol] = []
|
||||||
|
|
||||||
|
/// Called just before pressing an item so the owner can close its panel.
|
||||||
|
var onWillPress: (() -> Void)?
|
||||||
|
|
||||||
private init() {}
|
private init() {}
|
||||||
|
|
||||||
func start() {
|
func start() {
|
||||||
@@ -72,10 +77,11 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
|
|
||||||
var seenTitles = Set<String>()
|
var seenTitles = Set<String>()
|
||||||
for (index, child) in children.enumerated() {
|
for (index, child) in children.enumerated() {
|
||||||
|
let position = pointAttribute(child, kAXPositionAttribute)
|
||||||
// Control Center reports every module it owns, including the
|
// Control Center reports every module it owns, including the
|
||||||
// ones not in the menu bar, which are parked off-screen around
|
// ones not in the menu bar, which are parked off-screen around
|
||||||
// y=982. Keep only items actually sitting in the bar.
|
// 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
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,6 +93,14 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
// "Control Center"; show each distinct title once per app.
|
// "Control Center"; show each distinct title once per app.
|
||||||
if !seenTitles.insert(title).inserted { continue }
|
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(
|
found.append(MenuBarItem(
|
||||||
id: "\(pid)-\(index)",
|
id: "\(pid)-\(index)",
|
||||||
pid: pid,
|
pid: pid,
|
||||||
@@ -94,6 +108,7 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
title: title,
|
title: title,
|
||||||
icon: Self.icon(forTitle: title, app: app),
|
icon: Self.icon(forTitle: title, app: app),
|
||||||
isSystem: Self.isSystemBundle(app.bundleIdentifier),
|
isSystem: Self.isSystemBundle(app.bundleIdentifier),
|
||||||
|
frame: frame,
|
||||||
element: child
|
element: child
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@@ -113,6 +128,10 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
/// hide again shortly after. The reveal is momentary rather than lasting the
|
/// hide again shortly after. The reveal is momentary rather than lasting the
|
||||||
/// whole time the panel is open.
|
/// whole time the panel is open.
|
||||||
func press(_ item: MenuBarItem) {
|
func press(_ item: MenuBarItem) {
|
||||||
|
// Close our own panel first, otherwise it stays open on top of the
|
||||||
|
// menu that is about to appear (and can leave menus behind it).
|
||||||
|
onWillPress?()
|
||||||
|
|
||||||
let hider = MenuBarHider.shared
|
let hider = MenuBarHider.shared
|
||||||
let needsReveal = hider.isHiding
|
let needsReveal = hider.isHiding
|
||||||
guard needsReveal else {
|
guard needsReveal else {
|
||||||
@@ -120,23 +139,38 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
hider.suspend()
|
hider.suspend()
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
|
||||||
_ = self.performPress(item)
|
_ = self.performPress(item)
|
||||||
// The menu is its own window, positioned at the item's on-screen
|
// The menu is its own window, positioned at the item's on-screen
|
||||||
// spot, so the bar can be re-hidden almost immediately.
|
// spot, so the bar can be re-hidden shortly after.
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
|
||||||
hider.resume()
|
hider.resume()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func performPress(_ item: MenuBarItem) -> Bool {
|
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 {
|
if AXUIElementPerformAction(item.element, kAXPressAction as CFString) == .success {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return AXUIElementPerformAction(item.element, kAXShowMenuAction as CFString) == .success
|
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
|
// MARK: - Classification
|
||||||
|
|
||||||
/// Apple's own menu bar items (Control Center, Spotlight, the input-source
|
/// Apple's own menu bar items (Control Center, Spotlight, the input-source
|
||||||
@@ -228,6 +262,16 @@ final class MenuBarItemManager: ObservableObject {
|
|||||||
guard AXValueGetValue(value as! AXValue, .cgPoint, &point) else { return nil }
|
guard AXValueGetValue(value as! AXValue, .cgPoint, &point) else { return nil }
|
||||||
return point
|
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
|
/// Best-effort menu bar item hiding. A zero-width spacer status item is created
|
||||||
@@ -269,10 +313,15 @@ final class MenuBarHider: ObservableObject {
|
|||||||
// The boundary between "hidden" and "kept" falls just left of Wi-Fi at
|
// 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
|
// ~250, so the other apps hide while Apple's Wi-Fi/Clock/Battery/Control
|
||||||
// Center/Spotlight stay visible. `debug.spacerPos` overrides the seed.
|
// 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 {
|
if let override = UserDefaults.standard.object(forKey: "debug.spacerPos") as? Double {
|
||||||
UserDefaults.standard.set(override, forKey: key)
|
UserDefaults.standard.set(override, forKey: key)
|
||||||
} else if UserDefaults.standard.object(forKey: key) == nil {
|
} 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)
|
let item = NSStatusBar.system.statusItem(withLength: 0)
|
||||||
item.autosaveName = name
|
item.autosaveName = name
|
||||||
|
|||||||
@@ -103,9 +103,9 @@ func runSelfTest() {
|
|||||||
check(MenuBarItemManager.children(of: systemWide) == nil, "no children on a non-app element")
|
check(MenuBarItemManager.children(of: systemWide) == nil, "no children on a non-app element")
|
||||||
|
|
||||||
let element = AXUIElementCreateSystemWide()
|
let element = AXUIElementCreateSystemWide()
|
||||||
let first = MenuBarItem(id: "1-0", 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, 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, 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 == same, "menu bar items compare by id and title")
|
||||||
check(first != different, "different ids are not equal")
|
check(first != different, "different ids are not equal")
|
||||||
|
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ struct TopBarView: View {
|
|||||||
.controlSize(.mini)
|
.controlSize(.mini)
|
||||||
.padding(.horizontal, 12)
|
.padding(.horizontal, 12)
|
||||||
.padding(.top, 6)
|
.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.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
VERSION="${1:-0.4.2}"
|
VERSION="${1:-0.4.8}"
|
||||||
|
|
||||||
swift build -c release
|
swift build -c release
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ chmod +x scripts/make-icon.sh
|
|||||||
|
|
||||||
if [ -n "$IDENT" ]; then
|
if [ -n "$IDENT" ]; then
|
||||||
security unlock-keychain "$HOME/Library/Keychains/login.keychain-db" 2>/dev/null || true
|
security unlock-keychain "$HOME/Library/Keychains/login.keychain-db" 2>/dev/null || true
|
||||||
codesign --force --options runtime --sign "$IDENT" "$APP"
|
codesign --force --options runtime --timestamp --sign "$IDENT" "$APP"
|
||||||
echo "Built $APP ${VERSION} (signed with Developer ID '$IDENT') — open $APP"
|
echo "Built $APP ${VERSION} (signed with Developer ID '$IDENT') — open $APP"
|
||||||
else
|
else
|
||||||
codesign --force --sign - "$APP"
|
codesign --force --sign - "$APP"
|
||||||
|
|||||||
Reference in New Issue
Block a user