From d7a1eecfd9d40c7c114f9ecab8180e00107766ec Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 29 Nov 2018 23:40:15 +0100
Subject: [PATCH] [pkg] vendor fix for the separator in windows
---
vendor/README | 2 ++
vendor/github.com/getlantern/systray/systray_windows.go | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/vendor/README b/vendor/README
index de0db4e9..bd1bd99d 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 9d560b72..ae9c8385 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)),
)
--
GitLab