Merge pull request #1181 from p4bl0-/update-closing-event-behavior

Update closing event behavior to match GTK behavior in PR #1180
r0x0r · Jul 28, 2023 · 9853c68 · 9853c68
2 parents 8403b0a + 1a99275
commit 9853c68
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 28 deletions.
diff --git a/webview/platforms/cocoa.py b/webview/platforms/cocoa.py
@@ -911,14 +911,12 @@ def should_close(window):
         cancel = window.localization['global.cancel']
         msg = window.localization['global.quitConfirmation']
 
-        if not window.confirm_close or BrowserView.display_confirmation_dialog(quit, cancel, msg):
-            should_cancel = window.events.closing.set()
-            if should_cancel:
-                return Foundation.NO
-            else:
-                return Foundation.YES
-        else:
+        should_cancel = window.events.closing.set()
+        if should_cancel:
             return Foundation.NO
+        if not window.confirm_close or BrowserView.display_confirmation_dialog(quit, cancel, msg):
+            return Foundation.YES
+        return Foundation.NO
 
     @staticmethod
     def print_webview(webview):

diff --git a/webview/platforms/qt.py b/webview/platforms/qt.py
@@ -237,7 +237,6 @@ def __init__(self, window):
         self.js_bridge.window = window
 
         self.is_fullscreen = False
-        self.confirm_close = window.confirm_close
         self.text_select = window.text_select
 
         self._file_name_semaphore = Semaphore(0)
@@ -456,7 +455,13 @@ def on_set_on_top(self, top):
         self.show()
 
     def closeEvent(self, event):
-        if self.confirm_close:
+        should_cancel = self.pywebview_window.events.closing.set()
+
+        if should_cancel:
+            event.ignore()
+            return
+
+        if self.pywebview_window.confirm_close:
             reply = QMessageBox.question(
                 self,
                 self.title,
@@ -469,12 +474,6 @@ def closeEvent(self, event):
                 event.ignore()
                 return
 
-        should_cancel = self.pywebview_window.events.closing.set()
-
-        if should_cancel:
-            event.ignore()
-            return
-
         event.accept()
         BrowserView.instances[self.uid].close()
         del BrowserView.instances[self.uid]

diff --git a/webview/platforms/winforms.py b/webview/platforms/winforms.py
@@ -279,22 +279,21 @@ def _shutdown():
                 self.Invoke(Func[Type](_shutdown))
 
         def on_closing(self, sender, args):
-            if self.pywebview_window.confirm_close:
-                result = WinForms.MessageBox.Show(
-                    self.localization['global.quitConfirmation'],
-                    self.Text,
-                    WinForms.MessageBoxButtons.OKCancel,
-                    WinForms.MessageBoxIcon.Asterisk,
-                )
-
-                if result == WinForms.DialogResult.Cancel:
-                    args.Cancel = True
+            should_cancel = self.closing.set()
+            if should_cancel:
+                args.Cancel = True
 
             if not args.Cancel:
-                should_cancel = self.closing.set()
+                if self.pywebview_window.confirm_close:
+                    result = WinForms.MessageBox.Show(
+                        self.localization['global.quitConfirmation'],
+                        self.Text,
+                        WinForms.MessageBoxButtons.OKCancel,
+                        WinForms.MessageBoxIcon.Asterisk,
+                    )
 
-                if should_cancel:
-                    args.Cancel = True
+                    if result == WinForms.DialogResult.Cancel:
+                        args.Cancel = True
 
         def on_resize(self, sender, args):
             if self.WindowState == WinForms.FormWindowState.Maximized: