Changeset 52372 in vbox

Timestamp:

Aug 13, 2014 7:06:54 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Native full-screen support: Subsequent cumulative native full-screen validation fix #2.

Location:

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

Files:

• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -100 +100 @@
 void UIMachineLogicFullscreen::maybeAdjustGuestScreenSize()
 {
+    LogRel(("UIMachineLogicFullscreen::maybeAdjustGuestScreenSize"));
+
     /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();
+
+#ifdef Q_WS_MAC
+    /* For Lion and previous: */
+    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
+    {
+        /* Make sure all machine-window(s) have proper geometry: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            pMachineWindow->showInNecessaryMode();
+    }
+    /* Revalidate native fullscreen for ML and next: */
+    else revalidateNativeFullScreen();
+#else /* !Q_WS_MAC */
     /* Make sure all machine-window(s) have proper geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->showInNecessaryMode();
+#endif /* !Q_WS_MAC */
 }
 
@@ -353 +368 @@
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* Rebuild multi-screen layout: */
-        m_pScreenLayout->rebuild();
-        /* Make sure all machine-window(s) have proper geometry: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            pMachineWindow->showInNecessaryMode();
+        /* Adjust guest-screen size if necessary: */
+        maybeAdjustGuestScreenSize();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -88 +88 @@
 void UIMachineLogicSeamless::maybeAdjustGuestScreenSize()
 {
+    LogRel(("UIMachineLogicSeamless::maybeAdjustGuestScreenSize"));
+
     /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();
+
     /* Make sure all machine-window(s) have proper geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
@@ -147 +150 @@
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* Rebuild multi-screen layout: */
-        m_pScreenLayout->rebuild();
-        /* Make sure all machine-window(s) have proper geometry: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            pMachineWindow->showInNecessaryMode();
+        /* Adjust guest-screen size if necessary: */
+        maybeAdjustGuestScreenSize();
     }
 }
@@ -169 +169 @@
 void UIMachineLogicSeamless::sltScreenLayoutChanged()
 {
+    LogRel(("UIMachineLogicSeamless::sltScreenLayoutChanged: Multi-screen layout changed.\n"));
+
     /* Make sure all machine-window(s) have proper geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())