update macos icon

2026-05-12 03:39:55 +00:00 · 2026-05-11 15:40:04 +02:00
parent 439f44c6b4
commit 842ef0d657
5 changed files with 14 additions and 2 deletions
--- a/client/ui/build/darwin/Assets.car
+++ b/client/ui/build/darwin/Assets.car
--- a/client/ui/build/darwin/Taskfile.yml
+++ b/client/ui/build/darwin/Taskfile.yml
@@ -163,6 +163,8 @@ tasks:
      - 'echo "Skipping codesign (not available on {{OS}}). Sign the .app on macOS before distribution."'

  run:
+    deps:
+      - task: common:generate:icons
    cmds:
      - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/MacOS"
      - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/Resources"
--- a/client/ui/frontend/index.html
+++ b/client/ui/frontend/index.html
@@ -7,6 +7,6 @@
  </head>
  <body>
    <div id="root"></div>
-    <script type="module" src="/src/app-new.tsx"></script>
+    <script type="module" src="/src/app.tsx"></script>
  </body>
 </html>
--- a/client/ui/frontend/src/app-new.tsx
+++ b/client/ui/frontend/src/app-new.tsx
--- a/client/ui/main.go
+++ b/client/ui/main.go
@@ -7,6 +7,7 @@ import (
 	"embed"
 	"flag"
 	"log"
+	"runtime"
 	"strings"

 	"github.com/wailsapp/wails/v3/pkg/application"
@@ -66,6 +67,15 @@ func main() {
 	// declared before app.New so the closure has a stable reference.
 	var tray *Tray

+	// On macOS, application.Options.Icon is fed into NSApplication's
+	// setApplicationIconImage at startup, which would override the bundle
+	// icon (Assets.car / icons.icns) the OS already picked. We want the
+	// bundle's squircle to stay, so suppress it on darwin.
+	appIcon := iconWindow
+	if runtime.GOOS == "darwin" {
+		appIcon = nil
+	}
+
 	app := application.New(application.Options{
 		// Windows uses Name as the AppUserModelID for toast notifications
 		// (see notifications_windows.go: cfg.Name -> wn.appName -> AppID)
@@ -77,7 +87,7 @@ func main() {
 		// CustomActivator registry value is orphaned.
 		Name:        "NetBird",
 		Description: "NetBird desktop client",
-		Icon:        iconWindow,
+		Icon:        appIcon,
 		Assets: application.AssetOptions{
 			Handler: application.AssetFileServerFS(assets),
 		},