sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 06:59:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

tray: revert on-open click handler — OpenMenu freezes tray and React

Browse Source 
Binding OnClick/OnRightClick to call OpenMenu() on macOS routes the menu
open through showMenu(), which runs the blocking [button mouseDown:] inside
a dispatched block on the serial main GCD queue. While the menu is open that
block never returns, starving every other main-queue task — both tray item
updates and the webview event delivery that drives React freeze until the
menu closes.

Revert to the pre-d9f0189 state: no click handlers bound, native NSStatusItem
auto-show for left-click, Wails default rightClickHandler for right-click.
refreshSessionExpiresLabel() is kept for the follow-up fix.
This commit is contained in:
Zoltan Papp
2026-05-27 00:24:46 +02:00
parent 13179081d2
commit c77e5cef85
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/ui/tray.go
View File

@@ -62,7 +62,6 @@ const (
finalWarningCountdownSeconds = 120 finalWarningCountdownSeconds = 120
) )
// Tray builds and updates the systray menu. It mirrors the layout of the Fyne // Tray builds and updates the systray menu. It mirrors the layout of the Fyne
// systray 1:1 and routes clicks back to the gRPC services. Dynamic state // systray 1:1 and routes clicks back to the gRPC services. Dynamic state
// (status icon, exit-node submenu) is driven by the netbird:status event. // (status icon, exit-node submenu) is driven by the netbird:status event.
@@ -168,37 +167,15 @@ func NewTray(app *application.App, window *application.WebviewWindow, svc TraySe
t.tray.SetTooltip(t.loc.T("tray.tooltip")) t.tray.SetTooltip(t.loc.T("tray.tooltip"))
t.menu = t.buildMenu() t.menu = t.buildMenu()
t.tray.SetMenu(t.menu) t.tray.SetMenu(t.menu)
// Refresh the "Expires in …" countdown row each time the menu opens // Left-click on the tray icon opens the menu on every platform. The
// — the daemon's Status pushes are too coarse for a minute-grained // window is reached through the explicit "Open NetBird" entry. This
// countdown. Wails v3 alpha 95 does not expose a public NSMenu- // matches macOS NSStatusItem convention (click → menu), the Linux
// needsUpdate hook, so we piggy-back on the click handlers, which // StatusNotifierItem spec, and the legacy Fyne client. On Linux,
// fire just before (macOS / Windows right-click) or alongside (Linux // AttachWindow plus Wails3's applySmartDefaults would also pop the
// dbusmenu `opened`) the menu becoming visible. // window alongside the menu on environments like GNOME Shell with the
// // AppIndicator extension, so we intentionally skip both AttachWindow
// Where binding the click handler suppresses the platform's native // and OnClick here. Right-click still opens the menu through Wails'
// auto-show (macOS pre-click returns 0 instead of 1; Windows // default rightClickHandler fallback.
// rightClickHandler defaults to ShowMenu and is replaced) we have to
// call OpenMenu() ourselves to restore the popup. Linux's dbusmenu
// host paints the menu independently, so the handler only refreshes
// the label. AttachWindow is still skipped — under GNOME Shell with
// the AppIndicator extension it pops the window alongside the menu,
// which is not the UX we want.
refresh := func() { t.refreshSessionExpiresLabel() }
refreshAndOpen := func() {
t.refreshSessionExpiresLabel()
t.tray.OpenMenu()
}
switch runtime.GOOS {
case "darwin":
t.tray.OnClick(refreshAndOpen)
t.tray.OnRightClick(refreshAndOpen)
case "windows":
t.tray.OnClick(refresh)
t.tray.OnRightClick(refreshAndOpen)
default:
t.tray.OnClick(refresh)
t.tray.OnRightClick(refresh)
}
app.Event.On(services.EventStatus, t.onStatusEvent) app.Event.On(services.EventStatus, t.onStatusEvent)
app.Event.On(services.EventSystem, t.onSystemEvent) app.Event.On(services.EventSystem, t.onSystemEvent)