summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2018-11-29 23:40:15 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2018-11-29 23:40:15 +0100
commitd7a1eecfd9d40c7c114f9ecab8180e00107766ec (patch)
treeaa5c0280b0ae9f0a6ffab095bf752a8c7f897a09
parent59daf6c6ed64d58e8903db35637527fa46ed9c94 (diff)
[pkg] vendor fix for the separator in windows0.18.11
-rw-r--r--vendor/README2
-rw-r--r--vendor/github.com/getlantern/systray/systray_windows.go5
2 files changed, 6 insertions, 1 deletions
diff --git a/vendor/README b/vendor/README
index de0db4e..bd1bd99 100644
--- a/vendor/README
+++ b/vendor/README
@@ -1,3 +1,5 @@
2018-11-14
-----------------
* vendor getlantern/systray with PR #74, to work around menu positioning bug in windows.
+* manually add a patch for the 18x18 icon size for mac
+* vendor PR #76 too (add separator to visibleitems)
diff --git a/vendor/github.com/getlantern/systray/systray_windows.go b/vendor/github.com/getlantern/systray/systray_windows.go
index 9d560b7..ae9c838 100644
--- a/vendor/github.com/getlantern/systray/systray_windows.go
+++ b/vendor/github.com/getlantern/systray/systray_windows.go
@@ -508,9 +508,12 @@ func (t *winTray) addSeparatorMenuItem(menuId int32) error {
mi.Size = uint32(unsafe.Sizeof(mi))
+ t.addToVisibleItems(menuId)
+ position := t.getVisibleItemIndex(menuId)
+
res, _, err := pInsertMenuItem.Call(
uintptr(t.menu),
- uintptr(menuId),
+ uintptr(position),
1,
uintptr(unsafe.Pointer(&mi)),
)