From b0fb67451df000d25d3895bf9efcb13c8d8211d9 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 8 Jun 2024 13:05:06 +1000 Subject: [PATCH] Fix icon issue for darwin. --- v3/internal/templates/_common/Taskfile.tmpl.yml | 1 - v3/pkg/application/application.go | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/v3/internal/templates/_common/Taskfile.tmpl.yml b/v3/internal/templates/_common/Taskfile.tmpl.yml index d53fd28ed..9b0bbef5e 100644 --- a/v3/internal/templates/_common/Taskfile.tmpl.yml +++ b/v3/internal/templates/_common/Taskfile.tmpl.yml @@ -354,7 +354,6 @@ tasks: generates: - "icons.icns" - "icons.ico" - method: timestamp cmds: # Generates both .ico and .icns files - wails3 generate icons -input appicon.png diff --git a/v3/pkg/application/application.go b/v3/pkg/application/application.go index 90faa3065..5ddc3d413 100644 --- a/v3/pkg/application/application.go +++ b/v3/pkg/application/application.go @@ -22,7 +22,6 @@ import ( "github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/internal/capabilities" "github.com/wailsapp/wails/v3/pkg/events" - "github.com/wailsapp/wails/v3/pkg/icons" ) //go:embed assets/* @@ -162,9 +161,6 @@ func mergeApplicationDefaults(o *Options) { if o.Description == "" { o.Description = "An application written using Wails" } - if o.Icon == nil { - o.Icon = icons.ApplicationLightMode256 - } } type ( @@ -549,7 +545,9 @@ func (a *App) Run() error { if runtime.GOOS == "darwin" { 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() if err != nil {