diff options
| author |   Alexander Neumann <alexander.neumann@picos-software.com> | 2019-05-07 11:52:20 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@picos-software.com> | 2019-05-07 11:52:20 +0200 |
| commit | 864f65a9ab3aa8736738ba575de6219e66606a4a (patch) | |
| tree | 5223df05a79b8ad9e5513753e370cef8039f6e3c | |
| parent | Merge branch 'master' of github.com:lxn/walk (diff) | |
| parent | Merge pull request #509 from zx2c4-forks/jd/notifyicon-hack-fix (diff) | |
| download | wireguard-windows-864f65a9ab3aa8736738ba575de6219e66606a4a.tar.xz wireguard-windows-864f65a9ab3aa8736738ba575de6219e66606a4a.zip | |
Merge branch 'master' of github.com:lxn/walk
| -rw-r--r-- | notifyicon.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/notifyicon.go b/notifyicon.go index 0997050f..03bfdc98 100644 --- a/notifyicon.go +++ b/notifyicon.go @@ -163,15 +163,8 @@ func (ni *NotifyIcon) showMessage(title, info string, iconType uint32, icon *Ico nid.DwInfoFlags = iconType var oldIcon *Icon if iconType == win.NIIF_USER && icon != nil { - if win.GetVersion()&0xff >= 6 { - nid.HBalloonIcon = icon.hIcon - if ni.icon != nil { - nid.HIcon = ni.icon.hIcon - } - } else { - oldIcon = ni.icon - nid.HIcon = icon.hIcon - } + oldIcon = ni.icon + nid.HIcon = icon.hIcon nid.UFlags |= win.NIF_ICON } if title16, err := syscall.UTF16FromString(title); err == nil { |