diff --git a/v3/pkg/application/application_darwin.go b/v3/pkg/application/application_darwin.go index 8e0a0dc1..af0b1934 100644 --- a/v3/pkg/application/application_darwin.go +++ b/v3/pkg/application/application_darwin.go @@ -181,7 +181,7 @@ func (m *macosApp) setApplicationMenu(menu *Menu) { func (m *macosApp) run() error { // Add a hook to the ApplicationDidFinishLaunching event - m.parent.On(events.Mac.ApplicationDidFinishLaunching, func() { + m.parent.On(events.Mac.ApplicationDidFinishLaunching, func(*Event) { C.setApplicationShouldTerminateAfterLastWindowClosed(C.bool(m.parent.options.Mac.ApplicationShouldTerminateAfterLastWindowClosed)) C.setActivationPolicy(C.int(m.parent.options.Mac.ActivationPolicy)) C.activateIgnoringOtherApps() diff --git a/v3/pkg/application/events_common_darwin.go b/v3/pkg/application/events_common_darwin.go index 0a9eb1af..a8e13f57 100644 --- a/v3/pkg/application/events_common_darwin.go +++ b/v3/pkg/application/events_common_darwin.go @@ -10,7 +10,7 @@ var commonApplicationEventMap = map[events.ApplicationEventType]events.Applicati func (m *macosApp) setupCommonEvents() { for sourceEvent, targetEvent := range commonApplicationEventMap { - m.parent.On(sourceEvent, func() { + m.parent.On(sourceEvent, func(event *Event) { applicationEvents <- uint(targetEvent) }) } diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go index 6c3d1839..37a728c5 100644 --- a/v3/pkg/application/webview_window_darwin.go +++ b/v3/pkg/application/webview_window_darwin.go @@ -1076,7 +1076,7 @@ func (w *macosWebviewWindow) run() { w.setURL(w.parent.options.URL) } // We need to wait for the HTML to load before we can execute the javascript - w.parent.On(events.Mac.WebViewDidFinishNavigation, func(_ *WindowEventContext) { + w.parent.On(events.Mac.WebViewDidFinishNavigation, func(_ *WindowEvent) { if w.parent.options.JS != "" { w.execJS(w.parent.options.JS) } @@ -1086,15 +1086,15 @@ func (w *macosWebviewWindow) run() { }) // Translate ShouldClose to common WindowClosing event - w.parent.On(events.Mac.WindowShouldClose, func(_ *WindowEventContext) { + w.parent.On(events.Mac.WindowShouldClose, func(_ *WindowEvent) { w.parent.emit(events.Common.WindowClosing) }) // Translate WindowDidResignKey to common WindowLostFocus event - w.parent.On(events.Mac.WindowDidResignKey, func(_ *WindowEventContext) { + w.parent.On(events.Mac.WindowDidResignKey, func(_ *WindowEvent) { w.parent.emit(events.Common.WindowLostFocus) }) - w.parent.On(events.Mac.WindowDidResignMain, func(_ *WindowEventContext) { + w.parent.On(events.Mac.WindowDidResignMain, func(_ *WindowEvent) { w.parent.emit(events.Common.WindowLostFocus) }) @@ -1107,7 +1107,7 @@ func (w *macosWebviewWindow) run() { } else { // We have to wait until the window is shown before we can remove the shadow var cancel func() - cancel = w.parent.On(events.Mac.WindowDidBecomeKey, func(_ *WindowEventContext) { + cancel = w.parent.On(events.Mac.WindowDidBecomeKey, func(_ *WindowEvent) { w.setHasShadow(!w.parent.options.Mac.DisableShadow) cancel() })