Skip to content

notifyicon.go: move WM_ENTERMENULOOP and WM_EXITMENULOOP handlers to … #130

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

Merged
dblohm7 merged 1 commit into from
Mar 6, 2025
Merged

notifyicon.go: move WM_ENTERMENULOOP and WM_EXITMENULOOP handlers to … #130

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
10 changes: 4 additions & 6 deletions notifyicon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func (niw *notifyIconWindow) WndProc(hwnd win.HWND, msg uint32, wParam, lParam u
win.SetWindowPos(hwnd, 0, 0, 0, 0, 0, win.SWP_HIDEWINDOW|win.SWP_NOACTIVATE|win.SWP_NOSIZE|win.SWP_NOZORDER)
case win.WM_DPICHANGED:
niw.forIcon(func(ni *NotifyIcon) { ni.applyDPI() })
case win.WM_ENTERMENULOOP:
niw.forIcon(func(ni *NotifyIcon) { ni.activeContextMenus++ })
case win.WM_EXITMENULOOP:
niw.forIcon(func(ni *NotifyIcon) { ni.activeContextMenus-- })
default:
}

Expand Down Expand Up @@ -136,12 +140,6 @@ func (ni *NotifyIcon) wndProc(hwnd win.HWND, msg uint16, wParam uintptr) {
case win.NIN_BALLOONUSERCLICK:
ni.reEnableToolTip()
ni.messageClickedPublisher.Publish()

case win.WM_ENTERMENULOOP:
ni.activeContextMenus++

case win.WM_EXITMENULOOP:
ni.activeContextMenus--
}
}

Expand Down