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

[v3 windows] Do not disable WndProc messaging for systray when updating icon

Browse source
This commit is contained in:
stffabi 2023-05-07 21:25:28 +02:00 • committed by Misite Bao
commit 0de2bccd28
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
v3/pkg/application/systemtray_windows.go
View file

@ -3,11 +3,16 @@
package application
import (
"syscall"
"unsafe"
"github.com/samber/lo"
"github.com/wailsapp/wails/v3/pkg/events"
"github.com/wailsapp/wails/v3/pkg/w32"
"syscall"
"unsafe"
)
const (
WM_USER_SYSTRAY = w32.WM_USER + 1
)
type windowsSystemTray struct {
@ -33,16 +38,9 @@ func (s *windowsSystemTray) setMenu(menu *Menu) {
}
func (s *windowsSystemTray) run() {
NotifyIconClassName := "WailsSystray"
_, err := w32.RegisterWindow(NotifyIconClassName, getNativeApplication().wndProc)
if err != nil {
panic(err)
}
s.hwnd = w32.CreateWindowEx(
0,
w32.MustStringToUTF16Ptr(NotifyIconClassName),
windowClassName,
nil,
0,
0,
@ -62,7 +60,7 @@ func (s *windowsSystemTray) run() {
UID: uint32(s.parent.id),
UFlags: w32.NIF_ICON | w32.NIF_MESSAGE,
HIcon: s.currentIcon,
UCallbackMessage: w32.WM_USER + uint32(s.parent.id),
UCallbackMessage: WM_USER_SYSTRAY,
}
nid.CbSize = uint32(unsafe.Sizeof(nid))
@ -117,7 +115,7 @@ func (s *windowsSystemTray) updateIcon() {
s.currentIcon = newIcon
nid := s.newNotifyIconData()
nid.UFlags = w32.NIF_ICON | w32.NIF_MESSAGE
nid.UFlags = w32.NIF_ICON
if s.currentIcon != 0 {
nid.HIcon = s.currentIcon
}
@ -174,8 +172,9 @@ func (s *windowsSystemTray) destroy() {
func (s *windowsSystemTray) wndProc(msg uint32, wParam, lParam uintptr) uintptr {
switch msg {
case w32.WM_USER + uint32(s.parent.id):
switch lParam {
case WM_USER_SYSTRAY:
lparam := w32.LOWORD(uint32(lParam))
switch lparam {
case w32.WM_LBUTTONUP:
if s.parent.leftButtonClickHandler != nil {
s.parent.leftButtonClickHandler()