github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 01:00:21 +08:00
Code Projects Activity

Avoid adding duplicate menuitems (windows)

Browse Source 
Previously, when calling `.SetHidden(false)` on a menu item that was not hidden, a duplicate menu item was created.
This commit is contained in:
Ian VanSchooten 2025-03-06 08:49:22 -05:00 committed by Lea Anthony
parent 5fb1a14c36
commit 35cc7fd569
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v3/examples/menu/main.go
View File

@ -46,7 +46,7 @@ func main() {
// Hidden menu item that can be unhidden // Hidden menu item that can be unhidden
hidden := myMenu.Add("I was hidden").SetHidden(true) hidden := myMenu.Add("I was hidden").SetHidden(true)
myMenu.Add("Toggle hidden menu").OnClick(func(ctx *application.Context) { myMenu.Add("Toggle the hidden menu").OnClick(func(ctx *application.Context) {
hidden.SetHidden(!hidden.Hidden()) hidden.SetHidden(!hidden.Hidden())
}) })

11
v3/examples/systray-custom/main.go
View File

@ -2,11 +2,12 @@ package main
import ( import (
_ "embed" _ "embed"
"log"
"runtime"
"github.com/wailsapp/wails/v3/pkg/application" "github.com/wailsapp/wails/v3/pkg/application"
"github.com/wailsapp/wails/v3/pkg/events" "github.com/wailsapp/wails/v3/pkg/events"
"github.com/wailsapp/wails/v3/pkg/icons" "github.com/wailsapp/wails/v3/pkg/icons"
"log"
"runtime"
) )
var windowShowing bool var windowShowing bool
@ -52,6 +53,12 @@ func main() {
systemTray := app.NewSystemTray() systemTray := app.NewSystemTray()
menu := app.NewMenu() menu := app.NewMenu()
// Hidden menu item that can be unhidden
hidden := menu.Add("I was hidden").SetHidden(true)
menu.Add("Toggle the hidden menu").OnClick(func(ctx *application.Context) {
hidden.SetHidden(!hidden.Hidden())
menu.Update()
})
menu.Add("Quit").OnClick(func(data *application.Context) { menu.Add("Quit").OnClick(func(data *application.Context) {
app.Quit() app.Quit()
}) })

7
v3/pkg/application/menuitem_windows.go
View File

@ -24,8 +24,8 @@ type windowsMenuItem struct {
} }
func (m *windowsMenuItem) setHidden(hidden bool) { func (m *windowsMenuItem) setHidden(hidden bool) {
m.hidden = hidden if hidden && !m.hidden {
if m.hidden { m.hidden = true
// iterate the parent items and find the menu item before us // iterate the parent items and find the menu item before us
for i, item := range m.parent.items { for i, item := range m.parent.items {
if item == m.menuItem { if item == m.menuItem {
@ -41,7 +41,8 @@ func (m *windowsMenuItem) setHidden(hidden bool) {
// m.pos = w32.GetMenuItemPosition(m.hMenu, uint32(m.id)) // m.pos = w32.GetMenuItemPosition(m.hMenu, uint32(m.id))
// Remove from parent menu // Remove from parent menu
w32.RemoveMenu(m.hMenu, m.id, w32.MF_BYCOMMAND) w32.RemoveMenu(m.hMenu, m.id, w32.MF_BYCOMMAND)
} else { } else if !hidden && m.hidden {
m.hidden = false
// Add to parent menu // Add to parent menu
// Get the position of the item before us // Get the position of the item before us
var pos int var pos int