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

Timestamp:

Feb 26, 2014 10:16:51 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Native fullscreen multi-screen support: Using 'presentation mode' for better user experience. That fixes menu-bar flicker on secondary host-display. That also fixes issue with shifting 2nd screen in most of cases.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (6 diffs)

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

@@ -143 +143 @@
         if (m_fIsFullscreenInvalidated)
         {
-            /* Mark fullscreen mode valid again and re-enter it: */
             LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
                     "Machine-window(s) exited invalidated fullscreen, enter again...\n"));
+
+            /* Mark fullscreen mode valid again: */
             m_fIsFullscreenInvalidated = false;
+            /* Reactivate 'presentation mode': */
+            setPresentationModeEnabled(true);
+            /* Re-enter fullscreen mode: */
             foreach (UIMachineWindow *pMachineWindow, machineWindows())
                 pMachineWindow->showInNecessaryMode();
@@ -158 +162 @@
         else
         {
-            /* Change visual-state to requested: */
             LogRel(("UIMachineLogicFullscreen::sltHandleNativeFullscreenDidExit: "
                     "Machine-window(s) exited fullscreen, changing visual-state to requested...\n"));
+
+            /* Change visual-state to requested: */
             UIVisualStateType type = uisession()->requestedVisualState();
             if (type == UIVisualStateType_Invalid)
@@ -348 +353 @@
 void UIMachineLogicFullscreen::prepareOtherConnections()
 {
-    /* Make sure 'presentation mode' is updated for Lion and previous: */
+    /* Make sure 'presentation mode' preference handling
+     * is updated at runtime for Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
         connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
@@ -379 +385 @@
 
 #ifdef Q_WS_MAC
-    /* Activate 'presentation mode' for Lion and previous: */
-    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        setPresentationModeEnabled(true);
+    /* Activate 'presentation mode': */
+    setPresentationModeEnabled(true);
     /* For ML and next: */
-    else
+    if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
     {
         /* For all the machine-window(s): */
@@ -429 +434 @@
 
 #ifdef Q_WS_MAC
-    /* Deactivate 'presentation mode' for Lion and previous: */
-    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        setPresentationModeEnabled(false);
+    /* Deactivate 'presentation mode': */
+    setPresentationModeEnabled(false);
 #endif/* Q_WS_MAC */
 }
@@ -471 +475 @@
 void UIMachineLogicFullscreen::setPresentationModeEnabled(bool fEnabled)
 {
-    /* Make sure this method is only used for Lion and previous: */
-    AssertReturnVoid(vboxGlobal().osRelease() <= MacOSXRelease_Lion);
-
-    /* First check if we are on a screen which contains the Dock or the
-     * Menubar (which hasn't to be the same), only than the
-     * presentation mode have to be changed. */
-    if (   fEnabled
-        && m_pScreenLayout->isHostTaskbarCovert())
-    {
-        QString testStr = vboxGlobal().virtualBox().GetExtraData(GUI_PresentationModeEnabled).toLower();
-        /* Default to false if it is an empty value */
-        if (testStr.isEmpty() || testStr == "false")
-            SetSystemUIMode(kUIModeAllHidden, 0);
+    /* Should we enable it? */
+    if (fEnabled)
+    {
+        /* For Lion and previous: */
+        if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
+        {
+            /* Check if we have screen which contains the Dock or the Menubar (which hasn't to be the same),
+             * only than the 'presentation mode' have to be changed. */
+            if (m_pScreenLayout->isHostTaskbarCovert())
+            {
+                /* Load 'presentation mode' preference: */
+                QString strPresentationMode = vboxGlobal().virtualBox().GetExtraData(GUI_PresentationModeEnabled).toLower();
+                /* Default to 'false' if it is an empty value: */
+                if (strPresentationMode.isEmpty() || strPresentationMode == "false")
+                    SetSystemUIMode(kUIModeAllHidden, 0);
+                else
+                    SetSystemUIMode(kUIModeAllSuppressed, 0);
+            }
+        }
+        /* For ML and next: */
         else
+        {
+            /* I am not sure we have to check anything here.
+             * Without 'presentation mode' native fullscreen works pretty bad,
+             * so we have to enable it anyway: */
             SetSystemUIMode(kUIModeAllSuppressed, 0);
-    }
-    else
-        SetSystemUIMode(kUIModeNormal, 0);
+        }
+    }
+    /* Should we disable it? */
+    else SetSystemUIMode(kUIModeNormal, 0);
 }