From 72ec10b1813dc950fda53034edbb15c2dd513e18 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Fri, 16 Jun 2023 21:01:17 +1000
Subject: [PATCH] [v3 mac] Fix window close bug

---
 v3/pkg/application/webview_window_darwin.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go
index 4a5dc285..ccfd9314 100644
--- a/v3/pkg/application/webview_window_darwin.go
+++ b/v3/pkg/application/webview_window_darwin.go
@@ -936,10 +936,11 @@ func (w *macosWebviewWindow) windowZoom() {
 }
 
 func (w *macosWebviewWindow) close() {
-	C.windowClose(w.nsWindow)
-	if !w.parent.options.HideOnClose {
-		globalApplication.deleteWindowByID(w.parent.id)
+	if w.parent.options.HideOnClose {
+		w.hide()
+		return
 	}
+	C.windowClose(w.nsWindow)
 }
 
 func (w *macosWebviewWindow) zoomIn() {
@@ -1196,6 +1197,11 @@ func (w *macosWebviewWindow) run() {
 			globalApplication.deleteWindowByID(w.parent.id)
 		})
 
+		w.parent.On(events.Mac.WindowShouldClose, func(_ *WindowEventContext) {
+			// TODO: Process "should close" callback for user
+			w.close()
+		})
+
 		if w.parent.options.HTML != "" {
 			w.setHTML(w.parent.options.HTML)
 		}