yuanyeex
/
openclaw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mac): preserve SwiftUI menu delegate

main
Peter Steinberger 2025-12-13 03:11:06 +00:00
parent 164841f299
commit 12d9a13af0
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/macos/Sources/Clawdis/MenuContextCardInjector.swift
View File

@ -7,13 +7,21 @@ final class MenuContextCardInjector: NSObject, NSMenuDelegate {
private let tag = 9_415_227 private let tag = 9_415_227
private let cardWidth: CGFloat = 320 private let cardWidth: CGFloat = 320
private weak var originalDelegate: NSMenuDelegate?
func install(into statusItem: NSStatusItem) { func install(into statusItem: NSStatusItem) {
// SwiftUI owns the menu, but we can inject a custom NSMenuItem.view right before display. // SwiftUI owns the menu, but we can inject a custom NSMenuItem.view right before display.
statusItem.menu?.delegate = self guard let menu = statusItem.menu else { return }
// Preserve SwiftUI's internal NSMenuDelegate, otherwise it may stop populating menu items.
if menu.delegate !== self {
self.originalDelegate = menu.delegate
menu.delegate = self
}
} }
func menuWillOpen(_ menu: NSMenu) { func menuWillOpen(_ menu: NSMenu) {
self.originalDelegate?.menuWillOpen?(menu)
// Remove any previous injected card items. // Remove any previous injected card items.
for item in menu.items where item.tag == self.tag { for item in menu.items where item.tag == self.tag {
menu.removeItem(item) menu.removeItem(item)
@ -34,6 +42,21 @@ final class MenuContextCardInjector: NSObject, NSMenuDelegate {
menu.insertItem(item, at: insertIndex) menu.insertItem(item, at: insertIndex)
} }
func menuDidClose(_ menu: NSMenu) {
self.originalDelegate?.menuDidClose?(menu)
}
func menuNeedsUpdate(_ menu: NSMenu) {
self.originalDelegate?.menuNeedsUpdate?(menu)
}
func confinementRect(for menu: NSMenu, on screen: NSScreen?) -> NSRect {
if let rect = self.originalDelegate?.confinementRect?(for: menu, on: screen) {
return rect
}
return NSRect.zero
}
private func findInsertIndex(in menu: NSMenu) -> Int? { private func findInsertIndex(in menu: NSMenu) -> Int? {
// Prefer inserting before the "Send Heartbeats" toggle item. // Prefer inserting before the "Send Heartbeats" toggle item.
if let idx = menu.items.firstIndex(where: { $0.title == "Send Heartbeats" }) { if let idx = menu.items.firstIndex(where: { $0.title == "Send Heartbeats" }) {
@ -44,4 +67,3 @@ final class MenuContextCardInjector: NSObject, NSMenuDelegate {
return menu.items.count return menu.items.count
} }
} }