Changeset 90889 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2021 4:40:01 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Runtime UI: Move detach UI stuff to the place where it belongs (UISession).

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

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

@@ -385 +385 @@
 }
 #endif /* VBOX_WS_MAC */
-
-void UIMachineLogic::detach()
-{
-    /* Enable 'manual-override',
-     * preventing automatic Runtime UI closing: */
-    uisession()->setManualOverrideMode(true);
-
-    /* Was the step successful? */
-    bool fSuccess = true;
-    LogRel(("GUI: Passing request to detach UI from machine-logic to UI session.\n"));
-    fSuccess = uisession()->detach();
-
-    /* Manually close Runtime UI: */
-    if (fSuccess)
-        uisession()->closeRuntimeUI();
-}
 
 void UIMachineLogic::shutdown()
@@ -1871 +1855 @@
 
     LogRel(("GUI: User requested to detach GUI.\n"));
-    detach();
+    uisession()->detachUi();
 }
 

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

@@ -143 +143 @@
 #endif /* VBOX_WS_MAC */
 
-    /** Detach and close Runtime UI. */
-    void detach();
     /** Call for guest shutdown to close Runtime UI. */
     void shutdown();

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

@@ -448 +448 @@
             /* Detach GUI: */
             LogRel(("GUI: Request for close-action to detach GUI.\n"));
-            machineLogic()->detach();
+            uisession()->detachUi();
             break;
         }

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

@@ -320 +320 @@
 }
 
-bool UISession::detach()
-{
-    /* Nothing here for now: */
-    return true;
+void UISession::detachUi()
+{
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing: */
+    setManualOverrideMode(true);
+
+    /* Manually close Runtime UI: */
+    LogRel(("GUI: Detaching UI..\n"));
+    closeRuntimeUI();
 }
 

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

@@ -78 +78 @@
     bool powerUp();
     /** Detaches and closes Runtime UI. */
-    bool detach();
+    void detachUi();
     /** Saves VM state, then closes Runtime UI. */
     void saveState();