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

Timestamp:

Feb 21, 2014 7:31:53 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Native fullscreen support: Fullscreen mode invalidation logic allowing to dynamically update multi-screen layout.

Location:

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

Files:

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

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

@@ -35 +35 @@
 UIMachineLogicFullscreen::UIMachineLogicFullscreen(QObject *pParent, UISession *pSession)
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Fullscreen)
+#ifdef Q_WS_MAC
+    , m_fIsFullscreenInvalidated(false)
+#endif /* Q_WS_MAC */
 {
     /* Create multiscreen layout: */
@@ -137 +140 @@
     else
     {
-        /* Change visual-state to requested: */
-        LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
-                "Machine-window(s) exited fullscreen, changing visual-state to requested...\n"));
-        UIVisualStateType type = uisession()->requestedVisualState();
-        if (type == UIVisualStateType_Invalid)
-            type = UIVisualStateType_Normal;
-        uisession()->setRequestedVisualState(UIVisualStateType_Invalid);
-        uisession()->changeVisualState(type);
+        /* If fullscreen mode was just invalidated: */
+        if (m_fIsFullscreenInvalidated)
+        {
+            /* Mark fullscreen mode valid again and re-enter it: */
+            LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
+                    "Machine-window(s) exited invalidated fullscreen, enter again...\n"));
+            m_fIsFullscreenInvalidated = false;
+            foreach (UIMachineWindow *pMachineWindow, machineWindows())
+                pMachineWindow->showInNecessaryMode();
+            foreach (UIMachineWindow *pMachineWindow, machineWindows())
+                if (   (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
+                    && !darwinIsInFullscreenMode(pMachineWindow))
+                    darwinToggleFullscreenMode(pMachineWindow);
+        }
+        /* If fullscreen mode was manually exited: */
+        else
+        {
+            /* Change visual-state to requested: */
+            LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
+                    "Machine-window(s) exited fullscreen, changing visual-state to requested...\n"));
+            UIVisualStateType type = uisession()->requestedVisualState();
+            if (type == UIVisualStateType_Invalid)
+                type = UIVisualStateType_Normal;
+            uisession()->setRequestedVisualState(UIVisualStateType_Invalid);
+            uisession()->changeVisualState(type);
+        }
     }
 }
@@ -231 +252 @@
 void UIMachineLogicFullscreen::sltScreenLayoutChanged()
 {
+#ifdef Q_WS_MAC
+    /* For Lion and previous: */
+    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
+    {
+        /* Update machine-window(s) location/size: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            pMachineWindow->showInNecessaryMode();
+        /* Update 'presentation mode': */
+        setPresentationModeEnabled(true);
+    }
+    /* For ML and next: */
+    else
+    {
+        /* Invalidate and exit fullscreen mode: */
+        m_fIsFullscreenInvalidated = true;
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            if (darwinIsInFullscreenMode(pMachineWindow))
+                darwinToggleFullscreenMode(pMachineWindow);
+    }
+#else /* !Q_WS_MAC */
     /* Update machine-window(s) location/size: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->showInNecessaryMode();
-
-#ifdef Q_WS_MAC
-    /* Update 'presentation mode' for Lion and previous: */
-    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        setPresentationModeEnabled(true);
-#endif /* Q_WS_MAC */
+#endif /* !Q_WS_MAC */
 }
 

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

@@ -103 +103 @@
     /** Mac OS X: Contains machine-window(s) marked as 'fullscreen'. */
     QSet<UIMachineWindow*> m_fullscreenMachineWindows;
+    /** Mac OS X: Holds 'fullscreen' mode invalidation status. */
+    bool m_fIsFullscreenInvalidated;
 #endif /* Q_WS_MAC */