Changeset 52346 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 11, 2014 4:21:27 PM (11 years ago)

Author:

vboxsync

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

95472

Message:

FE/Qt: Mac OS X: Native full-screen support: Keep multi-screen layout updated when native full-screen mode entered/exited for particular machine-windows.

Location:

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

Files:

• fullscreen/UIMachineLogicFullscreen.cpp (modified) (6 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (4 diffs)

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

@@ -100 +100 @@
 void UIMachineLogicFullscreen::maybeAdjustGuestScreenSize()
 {
-    /* We should rebuild screen-layout: */
+    /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();
     /* Make sure all machine-window(s) have proper geometry: */
@@ -147 +147 @@
     AssertReturnVoid(m_fullscreenMachineWindows.contains(pMachineWindow));
 
+    /* Rebuild multi-screen layout: */
+    m_pScreenLayout->rebuild();
     /* Revalidate native fullscreen: */
     revalidateNativeFullScreen();
@@ -194 +196 @@
         AssertReturnVoid(!m_invalidFullscreenMachineWindows.contains(pMachineWindow));
 
+        /* Rebuild multi-screen layout: */
+        m_pScreenLayout->rebuild();
         /* Revalidate native fullscreen: */
         revalidateNativeFullScreen();
@@ -349 +353 @@
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* We should rebuild screen-layout: */
+        /* Rebuild multi-screen layout: */
         m_pScreenLayout->rebuild();
         /* Make sure all machine-window(s) have proper geometry: */
@@ -401 +405 @@
     LogRel(("UIMachineLogicFullscreen: Guest-screen count changed.\n"));
 
-    /* Update multi-screen layout before any window update: */
-    if (changeType == KGuestMonitorChangedEventType_Enabled ||
-        changeType == KGuestMonitorChangedEventType_Disabled)
-        m_pScreenLayout->rebuild();
+    /* Rebuild multi-screen layout: */
+    m_pScreenLayout->rebuild();
 
 #ifdef Q_WS_MAC
@@ -422 +424 @@
     LogRel(("UIMachineLogicFullscreen: Host-screen count changed.\n"));
 
-    /* Update multi-screen layout before any window update: */
+    /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();
 

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

@@ -88 +88 @@
 void UIMachineLogicSeamless::maybeAdjustGuestScreenSize()
 {
-    /* We should rebuild screen-layout: */
+    /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();
     /* Make sure all machine-window(s) have proper geometry: */
@@ -147 +147 @@
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* We should rebuild screen-layout: */
+        /* Rebuild multi-screen layout: */
         m_pScreenLayout->rebuild();
         /* Make sure all machine-window(s) have proper geometry: */
@@ -178 +178 @@
     LogRel(("UIMachineLogicSeamless: Guest-screen count changed.\n"));
 
-    /* Update multi-screen layout before any window update: */
-    if (changeType == KGuestMonitorChangedEventType_Enabled ||
-        changeType == KGuestMonitorChangedEventType_Disabled)
-        m_pScreenLayout->rebuild();
+    /* Rebuild multi-screen layout: */
+    m_pScreenLayout->rebuild();
 
     /* Call to base-class: */
@@ -191 +189 @@
     LogRel(("UIMachineLogicSeamless: Host-screen count changed.\n"));
 
-    /* Update multi-screen layout before any window update: */
+    /* Rebuild multi-screen layout: */
     m_pScreenLayout->rebuild();