Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d795d0a28 | ||
|
|
e465acba12 |
@@ -141,6 +141,9 @@ preferred position controls where the hidden/kept boundary lands:
|
||||
(`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
|
||||
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
|
||||
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
|
||||
|
||||
@@ -132,6 +132,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
)
|
||||
)
|
||||
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() {
|
||||
|
||||
@@ -30,6 +30,9 @@ final class MenuBarItemManager: ObservableObject {
|
||||
|
||||
private var observers: [NSObjectProtocol] = []
|
||||
|
||||
/// Called just before pressing an item so the owner can close its panel.
|
||||
var onWillPress: (() -> Void)?
|
||||
|
||||
private init() {}
|
||||
|
||||
func start() {
|
||||
@@ -113,6 +116,10 @@ final class MenuBarItemManager: ObservableObject {
|
||||
/// hide again shortly after. The reveal is momentary rather than lasting the
|
||||
/// whole time the panel is open.
|
||||
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 needsReveal = hider.isHiding
|
||||
guard needsReveal else {
|
||||
@@ -120,11 +127,11 @@ 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()
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
VERSION="${1:-0.4.2}"
|
||||
VERSION="${1:-0.4.4}"
|
||||
|
||||
swift build -c release
|
||||
|
||||
|
||||
Reference in New Issue
Block a user