Merge pull request getlantern#171 from lepsta/master

joesis · web-flow · commit 008a105d35ae · 2020-09-13T23:08:06.000-07:00
Does not use the template icon for regular icons
diff --git a/systray_darwin.go b/systray_darwin.go
@@ -24,7 +24,8 @@ func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
 // SetIcon sets the icon of a menu item. Only works on macOS and Windows.
 // iconBytes should be the content of .ico/.jpg/.png
 func (item *MenuItem) SetIcon(iconBytes []byte) {
-	item.SetTemplateIcon(iconBytes, iconBytes)
+	cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))
+	C.setMenuItemIcon(cstr, (C.int)(len(iconBytes)), C.int(item.id), false)
 }
 
 // SetTemplateIcon sets the icon of a menu item as a template icon (on macOS). On Windows, it

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {`
`24`	`24`	`// SetIcon sets the icon of a menu item. Only works on macOS and Windows.`
`25`	`25`	`// iconBytes should be the content of .ico/.jpg/.png`
`26`	`26`	`func (item *MenuItem) SetIcon(iconBytes []byte) {`
`27`		`- item.SetTemplateIcon(iconBytes, iconBytes)`
	`27`	`+ cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))`
	`28`	`+ C.setMenuItemIcon(cstr, (C.int)(len(iconBytes)), C.int(item.id), false)`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`// SetTemplateIcon sets the icon of a menu item as a template icon (on macOS). On Windows, it`