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

Timestamp:

Feb 25, 2014 11:40:33 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Native fullscreen auto-pilot support: Handling host/guest screen(s) enabling/disabling.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (5 diffs)
• UIMachineLogicFullscreen.h (modified) (1 diff)

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

@@ -150 +150 @@
                 pMachineWindow->showInNecessaryMode();
             foreach (UIMachineWindow *pMachineWindow, machineWindows())
-                if (   (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
+                if (   uisession()->isScreenVisible(pMachineWindow->screenId())
+                    && (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
                     && !darwinIsInFullscreenMode(pMachineWindow))
                     darwinToggleFullscreenMode(pMachineWindow);
@@ -262 +263 @@
         setPresentationModeEnabled(true);
     }
-    /* For ML and next: */
-    else
-    {
-        /* Invalidate and exit fullscreen mode: */
-        m_fIsFullscreenInvalidated = true;
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (darwinIsInFullscreenMode(pMachineWindow))
-                darwinToggleFullscreenMode(pMachineWindow);
-    }
+    /* Invalidate fullscreen mode for ML and next: */
+    else invalidateFullscreenMode();
 #else /* !Q_WS_MAC */
     /* Update machine-window(s) location/size: */
@@ -287 +281 @@
         m_pScreenLayout->rebuild();
 
+#ifdef Q_WS_MAC
+    /* Call to base-class for Lion and previous: */
+    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
+        UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
+    /* Invalidate fullscreen mode for ML and next: */
+    else invalidateFullscreenMode();
+#else /* !Q_WS_MAC */
     /* Call to base-class: */
     UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
+#endif /* !Q_WS_MAC */
 }
 
@@ -298 +300 @@
     m_pScreenLayout->rebuild();
 
+#ifdef Q_WS_MAC
+    /* Call to base-class for Lion and previous: */
+    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
+        UIMachineLogic::sltHostScreenCountChanged();
+    /* Invalidate fullscreen mode for ML and next: */
+    else invalidateFullscreenMode();
+#else /* !Q_WS_MAC */
     /* Call to base-class: */
     UIMachineLogic::sltHostScreenCountChanged();
+#endif /* !Q_WS_MAC */
 }
 
@@ -480 +490 @@
         SetSystemUIMode(kUIModeNormal, 0);
 }
-#endif /* Q_WS_MAC */
-
+
+void UIMachineLogicFullscreen::invalidateFullscreenMode()
+{
+    /* Make sure 'fullscreen' mode is not invalidated yet: */
+    if (m_fIsFullscreenInvalidated)
+        return;
+
+    /* Mark 'fullscreen' mode as invalidated: */
+    m_fIsFullscreenInvalidated = true;
+
+    /* Exit fullscreen mode: */
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        if (darwinIsInFullscreenMode(pMachineWindow))
+            darwinToggleFullscreenMode(pMachineWindow);
+}
+#endif /* Q_WS_MAC */
+

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

@@ -95 +95 @@
 #ifdef Q_WS_MAC
     void setPresentationModeEnabled(bool fEnabled);
+
+    /** Mac OS X: Invalidates 'fullscreen' mode. */
+    void invalidateFullscreenMode();
 #endif /* Q_WS_MAC */