diff --git a/v3/examples/binding/go.mod b/v3/examples/binding/go.mod index 47ffa7a4a..17718d9ae 100644 --- a/v3/examples/binding/go.mod +++ b/v3/examples/binding/go.mod @@ -17,7 +17,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/samber/lo v1.37.0 // indirect - github.com/wailsapp/go-webview2 v1.0.2 // indirect + github.com/wailsapp/go-webview2 v1.0.4 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/net v0.7.0 // indirect diff --git a/v3/examples/binding/go.sum b/v3/examples/binding/go.sum index e0ecae68e..d9e2d6c4d 100644 --- a/v3/examples/binding/go.sum +++ b/v3/examples/binding/go.sum @@ -31,6 +31,7 @@ github.com/tmclane/purego v0.0.0-20230601213035-1f25e70d7b01/go.mod h1:ah1In8AOt github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b h1:cztK9x+ikg6nFscy5c8NgtfIXv/d0ESdENy9+JkE8i4= github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/go-webview2 v1.0.2/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.4/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= golang.org/x/exp v0.0.0-20220930202632-ec3f01382ef9 h1:RjggHMcaTVp0LOVZcW0bo8alwHrOaCrGUDgfWUHhnN4= diff --git a/v3/examples/frameless/go.mod b/v3/examples/frameless/go.mod index 7265c79f2..afad9208f 100644 --- a/v3/examples/frameless/go.mod +++ b/v3/examples/frameless/go.mod @@ -17,7 +17,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/samber/lo v1.37.0 // indirect - github.com/wailsapp/go-webview2 v1.0.2 // indirect + github.com/wailsapp/go-webview2 v1.0.4 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/net v0.7.0 // indirect diff --git a/v3/examples/frameless/go.sum b/v3/examples/frameless/go.sum index fd1dbcc5d..2d64ab04b 100644 --- a/v3/examples/frameless/go.sum +++ b/v3/examples/frameless/go.sum @@ -31,6 +31,7 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b h1:cztK9x+ikg6nFscy5c8NgtfIXv/d0ESdENy9+JkE8i4= github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/go-webview2 v1.0.2/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.4/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= diff --git a/v3/examples/plugins/go.mod b/v3/examples/plugins/go.mod index 1e82aa24f..3132d13c5 100644 --- a/v3/examples/plugins/go.mod +++ b/v3/examples/plugins/go.mod @@ -23,7 +23,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/samber/lo v1.37.0 // indirect - github.com/wailsapp/go-webview2 v1.0.2 // indirect + github.com/wailsapp/go-webview2 v1.0.4 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect golang.org/x/mod v0.11.0 // indirect diff --git a/v3/examples/plugins/go.sum b/v3/examples/plugins/go.sum index d895b1e97..192ee283a 100644 --- a/v3/examples/plugins/go.sum +++ b/v3/examples/plugins/go.sum @@ -48,6 +48,7 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b h1:cztK9x+ikg6nFscy5c8NgtfIXv/d0ESdENy9+JkE8i4= github.com/wailsapp/go-webview2 v1.0.2-0.20230604075323-d593c659ca7b/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/go-webview2 v1.0.2/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.4/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= golang.org/x/exp v0.0.0-20220930202632-ec3f01382ef9 h1:RjggHMcaTVp0LOVZcW0bo8alwHrOaCrGUDgfWUHhnN4= diff --git a/v3/go.mod b/v3/go.mod index b919e71a5..410c8b452 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -27,7 +27,7 @@ require ( github.com/pterm/pterm v0.12.51 github.com/samber/lo v1.37.0 github.com/tc-hib/winres v0.1.6 - github.com/wailsapp/go-webview2 v1.0.2 + github.com/wailsapp/go-webview2 v1.0.4 github.com/wailsapp/mimetype v1.4.1 golang.org/x/net v0.7.0 golang.org/x/sys v0.9.0 diff --git a/v3/go.sum b/v3/go.sum index 7fcc0daa4..56abf69df 100644 --- a/v3/go.sum +++ b/v3/go.sum @@ -331,8 +331,8 @@ github.com/tc-hib/winres v0.1.6 h1:qgsYHze+BxQPEYilxIz/KCQGaClvI2+yLBAZs+3+0B8= github.com/tc-hib/winres v0.1.6/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A= github.com/tmclane/purego v0.0.0-20230601213035-1f25e70d7b01 h1:oQwu3iNDywGp1Hry+PDvz+grwbCGpzY+ckSnWKCnX5Y= github.com/tmclane/purego v0.0.0-20230601213035-1f25e70d7b01/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= -github.com/wailsapp/go-webview2 v1.0.2 h1:ypcJYe+f40+n8XjmV2nSsy3Dw506o6KYbt46tW4PFW4= -github.com/wailsapp/go-webview2 v1.0.2/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.4 h1:f+rn18MqZKpgn6HhhrpXzUg/zkDzNJyzIZIL3Gq2Pw4= +github.com/wailsapp/go-webview2 v1.0.4/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= diff --git a/v3/pkg/application/application.go b/v3/pkg/application/application.go index 0f20cad71..6d48f50f3 100644 --- a/v3/pkg/application/application.go +++ b/v3/pkg/application/application.go @@ -60,13 +60,13 @@ func New(appOptions Options) *App { windows: make(map[uint]*WebviewWindow), systemTrays: make(map[uint]*SystemTray), contextMenus: make(map[string]*Menu), - logger: appOptions.Logger, + Logger: appOptions.Logger, pid: os.Getpid(), } globalApplication = result - if result.logger == nil { - result.logger = DefaultLogger() + if result.Logger == nil { + result.Logger = DefaultLogger() } result.Events = NewWailsEventProcessor(result.dispatchEventToWindows) @@ -249,7 +249,7 @@ type App struct { clipboard *Clipboard Events *EventProcessor - logger *slog.Logger + Logger *slog.Logger contextMenus map[string]*Menu contextMenusLock sync.Mutex @@ -336,17 +336,21 @@ func (a *App) GetPID() int { } func (a *App) info(message string, args ...any) { - a.logger.Info(message, args...) + a.Logger.Info(message, args...) +} + +func (a *App) debug(message string, args ...any) { + a.Logger.Debug(message, args...) } func (a *App) fatal(message string, args ...any) { msg := "A FATAL ERROR HAS OCCURRED: " + message - a.logger.Error(msg, args...) + a.Logger.Error(msg, args...) os.Exit(1) } func (a *App) error(message string, args ...any) { - a.logger.Error(message, args...) + a.Logger.Error(message, args...) } func (a *App) NewWebviewWindowWithOptions(windowOptions WebviewWindowOptions) *WebviewWindow { diff --git a/v3/pkg/application/application_windows.go b/v3/pkg/application/application_windows.go index 7264452e5..92891785f 100644 --- a/v3/pkg/application/application_windows.go +++ b/v3/pkg/application/application_windows.go @@ -4,6 +4,7 @@ package application import ( "fmt" + "github.com/wailsapp/go-webview2/webviewloader" "golang.org/x/sys/windows" "os" "strconv" @@ -172,6 +173,9 @@ func (m *windowsApp) setApplicationMenu(menu *Menu) { } func (m *windowsApp) run() error { + if webviewloader.UsingGoWebview2Loader { + globalApplication.info("Using Go Webview2Loader") + } for eventID := range m.parent.applicationEventListeners { m.on(eventID) }