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

Support submenus

Browse source
This commit is contained in:
Lea Anthony 2022-10-06 23:13:42 +11:00
commit 181ba423a3
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,11 +13,10 @@ type PopupMenu struct {
menuData *menu.Menu
}
func buildMenu(parentMenu win32.HMENU, inputMenu *menu.Menu) (map[int]*menu.MenuItem, error) {
menuMapping := make(map[int]*menu.MenuItem)
func (p *PopupMenu) buildMenu(parentMenu win32.HMENU, inputMenu *menu.Menu, startindex int) error {
for index, item := range inputMenu.Items {
var ret bool
itemID := win32.MenuItemMsgID + index
itemID := index + startindex
flags := win32.MF_STRING
if item.Disabled {
flags = flags | win32.MF_GRAYED
@ -31,27 +30,39 @@ func buildMenu(parentMenu win32.HMENU, inputMenu *menu.Menu) (map[int]*menu.Menu
if item.IsSeparator() {
flags = flags | win32.MF_SEPARATOR
}
if item.SubMenu != nil {
flags = flags | win32.MF_POPUP
submenu := win32.CreatePopupMenu()
err := p.buildMenu(submenu, item.SubMenu, itemID)
if err != nil {
return err
}
ret = win32.AppendMenu(parentMenu, uintptr(flags), uintptr(submenu), item.Label)
if ret == false {
return errors.New("AppendMenu failed")
}
continue
}
menuMapping[itemID] = item
p.menuMapping[itemID] = item
ret = win32.AppendMenu(parentMenu, uintptr(flags), uintptr(itemID), item.Label)
if ret == false {
return nil, errors.New("AppendMenu failed")
return errors.New("AppendMenu failed")
}
}
return menuMapping, nil
return nil
}
func (p *PopupMenu) Update() error {
var err error
p.menu = win32.CreatePopupMenu()
p.menuMapping, err = buildMenu(p.menu, p.menuData)
return err
return p.buildMenu(p.menu, p.menuData, win32.MenuItemMsgID)
}
func NewPopupMenu(parent win32.HWND, inputMenu *menu.Menu) (*PopupMenu, error) {
result := &PopupMenu{
parent: parent,
menuData: inputMenu,
parent: parent,
menuData: inputMenu,
menuMapping: make(map[int]*menu.MenuItem),
}
err := result.Update()
return result, err

1
v2/internal/platform/win32/consts.go
View file

@ -105,6 +105,7 @@ const (
MF_DISABLED = 0x00000002
MF_SEPARATOR = 0x00000800
MF_CHECKED = 0x00000008
MF_POPUP = 0x00000010
MF_MENUBARBREAK = 0x00000020
TPM_LEFTALIGN = 0x0000