Changeset 102419 in vbox

Timestamp:

Dec 1, 2023 1:30:48 PM (17 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160562

Message:

FE/Qt: bugref:10450: Runtime UI: Make sure close-event is accepted when necessary as Qt6 always requires this opposing to Qt5.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (2 diffs)
• UIMachine.h (modified) (2 diffs)
• UIMachineWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -1121 +1121 @@
     /* Asynchronously ask QApplication to quit: */
     LogRel(("GUI: Request for async QApp quit.\n"));
+    m_fQuitRequested = true;
     QMetaObject::invokeMethod(qApp, "quit", Qt::QueuedConnection);
 }
@@ -1471 +1472 @@
     , m_defaultCloseAction(MachineCloseAction_Invalid)
     , m_restrictedCloseActions(MachineCloseAction_Invalid)
+    , m_fQuitRequested(false)
 {
     s_pInstance = this;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -680 +680 @@
         bool acquireWhetherGuestEnteredACPIMode(bool &fEntered);
 
+        /** Returns whether qpp quit is requested. */
+        bool isQuitRequested() const { return m_fQuitRequested; }
+
         /** Detaches and closes Runtime UI. */
         void detachUi();
@@ -1107 +1110 @@
         /** Merged restricted close actions. */
         MachineCloseAction  m_restrictedCloseActions;
+
+        /** Holds whether app quit is requested. */
+        bool  m_fQuitRequested;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -360 +360 @@
 void UIMachineWindow::closeEvent(QCloseEvent *pCloseEvent)
 {
-    /* Fast handling in case if session is invalid: */
-    if (!uimachine()->isSessionValid())
+    /* Always ignore close-event first: */
+    pCloseEvent->ignore();
+    /* But accept close-event if app quit was requested: */
+    if (uimachine()->isQuitRequested())
+    {
+        pCloseEvent->accept();
+        return;
+    }
+
+    /* In certain cases we need to just request app quit: */
+    if (   !uimachine()->isSessionValid()
+        || uimachine()->isTurnedOff())
     {
         uimachine()->closeRuntimeUI();
@@ -367 +377 @@
     }
 
-    /* Always ignore close-event first: */
-    pCloseEvent->ignore();
-
     /* Make sure machine is in one of the allowed states: */
     if (!uimachine()->isRunning() && !uimachine()->isPaused() && !uimachine()->isStuck())
-    {
-#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6 ... */
-        /* If we want to close the application, we need to accept the close event.
-           If we don't the QEvent::Quit processing in QApplication::event fails and
-           [QCocoaApplicationDelegate applicationShouldTerminate] complains printing
-           "Qt DEBUG: Application termination canceled" in the debug log. */
-        /** @todo qt6: This could easily be caused by something else, but needs to be
-         * looked at by a proper GUI expert.  */
-        if (uimachine()->isTurnedOff()) /** @todo qt6: Better state check here? */
-            pCloseEvent->accept();
-#endif
         return;
-    }
 
     /* If there is a close hook script defined: */