mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 12:16:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

client/systray: fix submenu row interactions

Browse Source 
The "Mullvad VPN" row and each multi-city country row were created via
AddSubMenuItemCheckbox. Some linux tray hosts treat a click on a row
that is both a submenu and a checkbox as a toggle rather than a submenu
expand, resulting in the picker being unreachable.

Use `AddSubMenuItem` for those parent rows.

Fixes #17879

Signed-off-by: Evan Lowry <evan@tailscale.com>
This commit is contained in:
Evan Lowry 2026-05-03 17:01:00 +00:00 committed by Evan Lowry
parent 290a6cc03c
commit 90714f2cb0
No known key found for this signature in database
GPG Key ID: DE30F32BFD3E3091
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/systray/systray.go
View File

@ -666,20 +666,20 @@ func (menu *Menu) rebuildExitNodeMenu(ctx context.Context) {
if len(mullvadExitNodes.countries) > 0 {
menu.exitNodes.AddSeparator()
menu.exitNodes.AddSubMenuItem("Location-based Exit Nodes", "").Disable()
mullvadMenu := menu.exitNodes.AddSubMenuItemCheckbox("Mullvad VPN", "", false)
mullvadMenu := menu.exitNodes.AddSubMenuItem("Mullvad VPN", "")
for _, country := range mullvadExitNodes.sortedCountries() {
flag := countryFlag(country.code)
countryMenu := mullvadMenu.AddSubMenuItemCheckbox(flag+" "+country.name, "", false)
countryTitle := flag + " " + country.name
// single-city country, no submenu
if len(country.cities) == 1 || hideMullvadCities {
countryMenu := mullvadMenu.AddSubMenuItemCheckbox(countryTitle, "", false)
setExitNodeOnClick(countryMenu, country.best.ID)
if status.ExitNodeStatus != nil {
for _, city := range country.cities {
for _, ps := range city.peers {
if status.ExitNodeStatus.ID == ps.ID {
mullvadMenu.Check()
countryMenu.Check()
}
}
@ -689,6 +689,7 @@ func (menu *Menu) rebuildExitNodeMenu(ctx context.Context) {
}
// multi-city country, build submenu with "best available" option and cities.
countryMenu := mullvadMenu.AddSubMenuItem(countryTitle, "")
time.Sleep(newMenuDelay)
bm := countryMenu.AddSubMenuItemCheckbox("Best Available", "", false)
setExitNodeOnClick(bm, country.best.ID)
@ -700,8 +701,6 @@ func (menu *Menu) rebuildExitNodeMenu(ctx context.Context) {
if status.ExitNodeStatus != nil {
for _, ps := range city.peers {
if status.ExitNodeStatus.ID == ps.ID {
mullvadMenu.Check()
countryMenu.Check()
cityMenu.Check()
}
}