Changeset 99140 in vbox for trunk/src/VBox

Timestamp:

Mar 23, 2023 12:26:28 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Small rework for UIMachine prepare/cleanup cascade; Split screen data to host related and guest related.

Location:

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

Files:

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

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

@@ -1472 +1472 @@
     prepareBranding();
     prepareActions();
-    prepareScreens();
+    prepareHostScreenData();
+    prepareGuestScreenData();
     prepareKeyboard();
     prepareClose();
@@ -1650 +1651 @@
 }
 
-void UIMachine::prepareScreens()
+void UIMachine::prepareHostScreenData()
 {
     /* Recache display data: */
@@ -1664 +1665 @@
                 this, &UIMachine::sltCheckIfHostDisplayChanged);
     }
-#endif /* VBOX_WS_MAC */
-
-#ifdef VBOX_WS_MAC
     /* Install native display reconfiguration callback: */
     CGDisplayRegisterReconfigurationCallback(cgDisplayReconfigurationCallback, this);
@@ -1683 +1681 @@
 # endif /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 #endif /* !VBOX_WS_MAC */
-
+}
+
+void UIMachine::prepareGuestScreenData()
+{
     /* Accquire guest-screen count: */
     ulong cMonitorCount = 0;
@@ -1797 +1798 @@
 }
 
-void UIMachine::cleanupScreens()
+void UIMachine::cleanupHostScreenData()
 {
 #ifdef VBOX_WS_MAC
@@ -1844 +1845 @@
     /* Cleanup stuff: */
     cleanupMachineLogic();
-    cleanupScreens();
+    cleanupHostScreenData();
     cleanupActions();
     cleanupBranding();

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

@@ -850 +850 @@
     /** Prepare routine: Actions stuff. */
     void prepareActions();
-    /** Prepare routine: Screens stuff. */
-    void prepareScreens();
+    /** Prepare routine: Host-screen data stuff. */
+    void prepareHostScreenData();
+    /** Prepare routine: Guest-screen data stuff. */
+    void prepareGuestScreenData();
     /** Prepare routine: Keyboard stuff. */
     void prepareKeyboard();
@@ -861 +863 @@
     /** Cleanup routine: Machine-logic stuff. */
     void cleanupMachineLogic();
-    /** Cleanup routine: Screens stuff. */
-    void cleanupScreens();
+    /** Cleanup routine: Host-screen data stuff. */
+    void cleanupHostScreenData();
     /** Cleanup routine: Actions stuff. */
     void cleanupActions();