github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 20:29:37 +08:00
Code Projects Activity

Fix icon issue for darwin.

Browse Source
This commit is contained in:
Lea Anthony 2024-06-08 13:05:06 +10:00
parent f454abf45a
commit b0fb67451d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v3/internal/templates/_common/Taskfile.tmpl.yml
View File

@ -354,7 +354,6 @@ tasks:
generates: generates:
- "icons.icns" - "icons.icns"
- "icons.ico" - "icons.ico"
method: timestamp
cmds: cmds:
# Generates both .ico and .icns files # Generates both .ico and .icns files
- wails3 generate icons -input appicon.png - wails3 generate icons -input appicon.png

8
v3/pkg/application/application.go
View File

@ -22,7 +22,6 @@ import (
"github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/internal/assetserver/webview"
"github.com/wailsapp/wails/v3/internal/capabilities" "github.com/wailsapp/wails/v3/internal/capabilities"
"github.com/wailsapp/wails/v3/pkg/events" "github.com/wailsapp/wails/v3/pkg/events"
"github.com/wailsapp/wails/v3/pkg/icons"
) )
//go:embed assets/* //go:embed assets/*
@ -162,9 +161,6 @@ func mergeApplicationDefaults(o *Options) {
if o.Description == "" { if o.Description == "" {
o.Description = "An application written using Wails" o.Description = "An application written using Wails"
} }
if o.Icon == nil {
o.Icon = icons.ApplicationLightMode256
}
} }
type ( type (
@ -549,7 +545,9 @@ func (a *App) Run() error {
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
a.impl.setApplicationMenu(a.ApplicationMenu) a.impl.setApplicationMenu(a.ApplicationMenu)
} }
a.impl.setIcon(a.options.Icon) if a.options.Icon != nil {
a.impl.setIcon(a.options.Icon)
}
err = a.impl.run() err = a.impl.run()
if err != nil { if err != nil {