deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix menuID bug

Browse source
This commit is contained in:
Lea Anthony 2022-10-12 20:54:05 +11:00
commit 4fe1aff55e
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
v2/internal/platform/systray/menu.go
View file

@ -43,16 +43,18 @@ type PopupMenu struct {
checkboxItems map[*menu.MenuItem][]int
radioGroups map[*menu.MenuItem][]*RadioGroup
menuData *menu.Menu
currentMenuID int
}
func (p *PopupMenu) buildMenu(parentMenu win32.PopupMenu, inputMenu *menu.Menu, startindex int) error {
func (p *PopupMenu) buildMenu(parentMenu win32.PopupMenu, inputMenu *menu.Menu) error {
var currentRadioGroup RadioGroup
for index, item := range inputMenu.Items {
for _, item := range inputMenu.Items {
if item.Hidden {
continue
}
var ret bool
itemID := index + startindex
p.currentMenuID++
itemID := p.currentMenuID
p.menuMapping[itemID] = item
flags := win32.MF_STRING
@ -87,7 +89,7 @@ func (p *PopupMenu) buildMenu(parentMenu win32.PopupMenu, inputMenu *menu.Menu,
if item.SubMenu != nil {
flags = flags | win32.MF_POPUP
submenu := win32.CreatePopupMenu()
err := p.buildMenu(submenu, item.SubMenu, itemID)
err := p.buildMenu(submenu, item.SubMenu)
if err != nil {
return err
}
@ -120,7 +122,8 @@ func (p *PopupMenu) buildMenu(parentMenu win32.PopupMenu, inputMenu *menu.Menu,
func (p *PopupMenu) Update() error {
p.menu = win32.CreatePopupMenu()
p.menuMapping = make(map[int]*menu.MenuItem)
err := p.buildMenu(p.menu, p.menuData, win32.MenuItemMsgID)
p.currentMenuID = win32.MenuItemMsgID
err := p.buildMenu(p.menu, p.menuData)
if err != nil {
return err
}