Update icon

app/tray/on_ready.go

@@ -1,13 +1,47 @@
 package tray
 
 import (
+	"bytes"
+	"image/png"
+	"runtime"
+
 	"fyne.io/systray"
+	toicon "github.com/Kodeworks/golang-image-ico"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/icon"
+	"github.com/wzshiming/jumpway/log"
+	"github.com/wzshiming/systheme"
 )
 
 func (a *App) onReady() {
-	systray.SetTemplateIcon(icon.White, icon.White)
+	ico := icon.Black
+	switch t, _ := systheme.GetTheme(); t {
+	case systheme.Light:
+		ico = icon.Black
+	case systheme.Dark:
+		ico = icon.White
+	case systheme.Unknown:
+		ico = icon.Gray
+	}
+
+	if runtime.GOOS == "windows" {
+		buf := bytes.NewBuffer(nil)
+		img, err := png.Decode(bytes.NewReader(ico))
+		if err != nil {
+			log.Error(err, "Unable to decode icon")
+		} else {
+			err = toicon.Encode(buf, img)
+			if err != nil {
+				log.Error(err, "Unable to encode icon")
+			} else {
+				ico = buf.Bytes()
+				systray.SetTemplateIcon(ico, ico)
+			}
+		}
+	} else {
+		systray.SetTemplateIcon(ico, ico)
+	}
+
 	systray.SetTitle("")
 	systray.SetTooltip("Jump Way")
 

go.mod

@@ -4,6 +4,7 @@ go 1.21
 
 require (
 	fyne.io/systray v1.10.0
+	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/atotto/clipboard v0.1.4
 	github.com/gorilla/handlers v1.5.2
@@ -19,6 +20,7 @@ require (
 	github.com/wzshiming/openapiui/v2 v2.0.0
 	github.com/wzshiming/sysnotify v0.0.2
 	github.com/wzshiming/sysproxy v0.2.2
+	github.com/wzshiming/systheme v0.0.1
 	golang.org/x/text v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -1,5 +1,7 @@
 fyne.io/systray v1.10.0 h1:Yr1D9Lxeiw3+vSuZWPlaHC8BMjIHZXJKkek706AfYQk=
 fyne.io/systray v1.10.0/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE=
+github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA=
+github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Xuanwo/go-locale v1.1.0 h1:51gUxhxl66oXAjI9uPGb2O0qwPECpriKQb2hl35mQkg=
@@ -84,6 +86,8 @@ github.com/wzshiming/sysnotify v0.0.2 h1:a5h1lm2D35Sof8MaM0htjwFRNNqkx42o3pgsoAR
 github.com/wzshiming/sysnotify v0.0.2/go.mod h1:wV51YHA43Y1rhnhTi4qdpyPMoyG+sB1bAGORkANLW5I=
 github.com/wzshiming/sysproxy v0.2.2 h1:OOZ7jRier8qA5U5hnzHwJCLlZleWqdqiNKEhJY+0H1E=
 github.com/wzshiming/sysproxy v0.2.2/go.mod h1:Epx6hex0nK1YhLHDnIhrhusgCtBQFR2NQPhM8WlMDTc=
+github.com/wzshiming/systheme v0.0.1 h1:mRjzxaHyAQJ+b9TEZtrTF4ImVdEat9SMDaV5pWs5U1c=
+github.com/wzshiming/systheme v0.0.1/go.mod h1:8kRlfe8xyQbCBtzVIhz4ClScn41pDqQLT7QevwaK1cY=
 github.com/wzshiming/trie v0.1.1 h1:02AaBSZGhs6Aqljp8fz4xq/Mg8omFBPIlrUS0pJ11ks=
 github.com/wzshiming/trie v0.1.1/go.mod h1:c9thxXTh4KcGkejt4sUsO4c5GUmWpxeWzOJ7AZJaI+8=
 github.com/xtaci/smux v1.5.16 h1:FBPYOkW8ZTjLKUM4LI4xnnuuDC8CQ/dB04HD519WoEk=