Better handling of "shouldclose"

Author: leaanthony

v3/pkg/application/webview_window_darwin.go

@@ -43,6 +43,7 @@ void* windowNew(unsigned int id, int width, int height, bool fraudulentWebsiteWa
 	// Set delegate
 	[window setDelegate:delegate];
 	delegate.windowId = id;
+	delegate.shouldClose = false;
 
 	// Add NSView to window
 	NSView* view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, width-1, height-1)];
@@ -600,8 +601,17 @@ void windowSetShadow(void* nsWindow, bool hasShadow) {
 }
 
 
+// windowSetShouldClose sets the shouldClose flag on the window delegate
+static void windowSetShouldClose(void *window, bool shouldClose) {
+	WebviewWindow* nsWindow = (WebviewWindow*)window;
+	WebviewWindowDelegate* delegate = (WebviewWindowDelegate*)[nsWindow delegate];
+	delegate.shouldClose = shouldClose;
+}
+
 // windowClose closes the current window
 static void windowClose(void *window) {
+	// Set the shouldClose flag to allow the window to close
+	windowSetShouldClose(window, true);
 	[(WebviewWindow*)window close];
 }
 

v3/pkg/application/webview_window_darwin.h

@@ -25,6 +25,7 @@
 @property unsigned int invisibleTitleBarHeight;
 @property BOOL showToolbarWhenFullscreen;
 @property NSWindowStyleMask previousStyleMask; // Used to restore the window style mask when using frameless
+@property BOOL shouldClose; // Flag to indicate if the window should close unconditionally
 
 - (void)handleLeftMouseUp:(NSWindow *)window;
 - (void)handleLeftMouseDown:(NSEvent*)event;

v3/pkg/application/webview_window_darwin.m

@@ -231,6 +231,11 @@ - (void)performZoomReset:(id)sender {
 @implementation WebviewWindowDelegate
 - (BOOL)windowShouldClose:(NSWindow *)sender {
     WebviewWindowDelegate* delegate = (WebviewWindowDelegate*)[sender delegate];
+    // Check if this window should close unconditionally (called from Close() method)
+    if (delegate.shouldClose) {
+        return true;
+    }
+    // Otherwise, emit the WindowClosing event and let the application decide
     processWindowEvent(delegate.windowId, EventWindowShouldClose);
     return false;
 }

v3/pkg/events/defaults.go

@@ -40,7 +40,7 @@ var defaultWindowEventMapping = map[string]map[WindowEventType]WindowEventType{
 		Mac.WindowZoomIn:             Common.WindowZoomIn,
 		Mac.WindowZoomOut:            Common.WindowZoomOut,
 		Mac.WindowZoomReset:          Common.WindowZoomReset,
-		Mac.WindowWillClose:          Common.WindowClosing,
+		Mac.WindowShouldClose:        Common.WindowClosing,
 	},
 	"linux": {
 		Linux.WindowDeleteEvent: Common.WindowClosing,