sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-19 15:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

update macos icon

Browse Source
This commit is contained in:
Eduard Gert
2026-05-11 15:40:04 +02:00
parent 439f44c6b4
commit 842ef0d657
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
client/ui/build/darwin/Assets.car
View File

Binary file not shown.

2
client/ui/build/darwin/Taskfile.yml
View File

@@ -163,6 +163,8 @@ tasks:
- 'echo "Skipping codesign (not available on {{OS}}). Sign the .app on macOS before distribution."' - 'echo "Skipping codesign (not available on {{OS}}). Sign the .app on macOS before distribution."'
run: run:
deps:
- task: common:generate:icons
cmds: cmds:
- mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/MacOS" - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/MacOS"
- mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/Resources" - mkdir -p "{{.BIN_DIR}}/{{.APP_NAME}}.dev.app/Contents/Resources"

2
client/ui/frontend/index.html
View File

@@ -7,6 +7,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/app-new.tsx"></script> <script type="module" src="/src/app.tsx"></script>
</body> </body>
</html> </html>

0
client/ui/frontend/src/app-new.tsx → client/ui/frontend/src/app.tsx
View File

12
client/ui/main.go
View File

@@ -7,6 +7,7 @@ import (
"embed" "embed"
"flag" "flag"
"log" "log"
"runtime"
"strings" "strings"
"github.com/wailsapp/wails/v3/pkg/application" "github.com/wailsapp/wails/v3/pkg/application"
@@ -66,6 +67,15 @@ func main() {
// declared before app.New so the closure has a stable reference. // declared before app.New so the closure has a stable reference.
var tray *Tray 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{ app := application.New(application.Options{
// Windows uses Name as the AppUserModelID for toast notifications // Windows uses Name as the AppUserModelID for toast notifications
// (see notifications_windows.go: cfg.Name -> wn.appName -> AppID) // (see notifications_windows.go: cfg.Name -> wn.appName -> AppID)
@@ -77,7 +87,7 @@ func main() {
// CustomActivator registry value is orphaned. // CustomActivator registry value is orphaned.
Name: "NetBird", Name: "NetBird",
Description: "NetBird desktop client", Description: "NetBird desktop client",
Icon: iconWindow, Icon: appIcon,
Assets: application.AssetOptions{ Assets: application.AssetOptions{
Handler: application.AssetFileServerFS(assets), Handler: application.AssetFileServerFS(assets),
}, },