Skip to content

Hide Submenu Arrow when last entry is hidden #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hide Submenu Arrow when last entry is hidden #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions systray_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,29 @@ func (t *winTray) convertToSubMenu(menuItemId uint32) (windows.Handle, error) {
return menu, nil
}

func (t *winTray) dropSubMenu(menuItemId uint32) error {
const MIIM_SUBMENU = 0x00000004

mi := menuItemInfo{Mask: MIIM_SUBMENU, SubMenu: 0}
mi.Size = uint32(unsafe.Sizeof(mi))
t.muMenuOf.RLock()
hMenu := t.menuOf[menuItemId]
t.muMenuOf.RUnlock()
res, _, err := pSetMenuItemInfo.Call(
uintptr(hMenu),
uintptr(menuItemId),
0,
uintptr(unsafe.Pointer(&mi)),
)
if res == 0 {
return err
}
t.muMenus.Lock()
delete(t.menus, menuItemId)
t.muMenus.Unlock()
return nil
}

func (t *winTray) addOrUpdateMenuItem(menuItemId uint32, parentId uint32, title string, disabled, checked bool) error {
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms647578(v=vs.85).aspx
const (
Expand Down Expand Up @@ -570,7 +593,7 @@ func (t *winTray) addOrUpdateMenuItem(menuItemId uint32, parentId uint32, title
uintptr(unsafe.Pointer(&mi)),
)
if res == 0 {
t.delFromVisibleItems(parentId, menuItemId)
_ = t.delFromVisibleItems(parentId, menuItemId)
return err
}
t.muMenuOf.Lock()
Expand Down Expand Up @@ -632,9 +655,7 @@ func (t *winTray) hideMenuItem(menuItemId, parentId uint32) error {
if res == 0 && err.(syscall.Errno) != ERROR_SUCCESS {
return err
}
t.delFromVisibleItems(parentId, menuItemId)

return nil
return t.delFromVisibleItems(parentId, menuItemId)
}

func (t *winTray) showMenu() error {
Expand Down Expand Up @@ -665,7 +686,7 @@ func (t *winTray) showMenu() error {
return nil
}

func (t *winTray) delFromVisibleItems(parent, val uint32) {
func (t *winTray) delFromVisibleItems(parent, val uint32) error {
t.muVisibleItems.Lock()
defer t.muVisibleItems.Unlock()
visibleItems := t.visibleItems[parent]
Expand All @@ -675,6 +696,10 @@ func (t *winTray) delFromVisibleItems(parent, val uint32) {
break
}
}
if parent != 0 && len(t.visibleItems[parent]) == 0 {
return t.dropSubMenu(parent)
}
return nil
}

func (t *winTray) addToVisibleItems(parent, val uint32) {
Expand Down