Left-click support for linux (#6410)

This commit is contained in:
Pascal Fischer
2026-06-16 17:46:48 +02:00
committed by GitHub
parent 1f69cd189e
commit 0c21aefc7f
2 changed files with 39 additions and 3 deletions

View File

@@ -0,0 +1,31 @@
//go:build linux && !(linux && 386)
package main
// bindTrayClick wires the tray icon's left-click handler on Linux.
//
// Both Linux click paths converge on Wails' linuxSystemTray.Activate, which
// fires the registered clickHandler:
// - Real SNI hosts (KDE Plasma, Waybar, GNOME Shell + AppIndicator) invoke
// org.kde.StatusNotifierItem.Activate over D-Bus on left-click.
// - The in-process StatusNotifierWatcher + XEmbed host used on minimal WMs
// (Fluxbox, i3, dwm, OpenBox) maps a Button1 press to that same Activate
// call itself (xembed_host_linux.go), so it routes through the same hook.
// Registering OnClick here therefore covers both paths with one handler — no
// changes to the watcher or XEmbed C code are needed. Left-click now opens the
// main window; right-click still opens the menu via Wails' default
// SecondaryActivate→OpenMenu handler (and the XEmbed GTK popup on minimal WMs).
//
// We do NOT register OnDoubleClick: Wails' Linux SNI backend never fires it
// (unlike Windows). And we deliberately skip AttachWindow — it plus Wails3's
// applySmartDefaults would pop the window alongside the menu on GNOME Shell
// with the AppIndicator extension (see the bindTrayClick comment in tray.go).
//
// ShowWindow() is the same dispatcher the explicit "Open NetBird" menu entry
// and SIGUSR1 use: it brings the install-progress / browser-login window
// forward when one of those flows is active, otherwise routes through
// WindowManager.ShowMain so the window re-centers on minimal WMs / the XEmbed
// path instead of landing in the top-left corner.
func bindTrayClick(t *Tray) {
t.tray.OnClick(func() { t.ShowWindow() })
}

View File

@@ -1,8 +1,13 @@
//go:build !windows && !android && !ios && !freebsd && !js
//go:build !windows && !android && !ios && !freebsd && !js && (!linux || (linux && 386))
package main
func bindTrayClick(*Tray) {
// No-op: macOS/Linux native trays open the menu on click themselves.
// Only Windows needs an explicit handler (tray_click_windows.go).
// No-op: macOS's native NSStatusItem opens the menu on click itself, and
// binding OnClick→anything blocking there froze the tray historically
// (see tray_click_windows.go). Windows wires an explicit handler
// (tray_click_windows.go); Linux opens the window on left-click
// (tray_click_linux.go). The (linux && 386) arm keeps a no-op fallback for
// the i386 Linux build, which excludes the cgo XEmbed/SNI files that
// tray_click_linux.go's build tag matches.
}