Changeset 26961 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 2, 2010 5:13:50 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Enable the blending transition between fs and normal mode switches again on OSX.

Location:

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

Files:

• UIMachine.cpp (modified) (5 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -30 +30 @@
 #include "UIMachineWindow.h"
 
+#ifdef Q_WS_MAC
+# ifdef QT_MAC_USE_COCOA
+#  include <Carbon/Carbon.h>
+# endif /* QT_MAC_USE_COCOA */
+#endif /* Q_WS_MAC */
+
 class UIVisualState : public QObject
 {
@@ -42 +48 @@
         , m_pActionsPool(pActionsPool)
         , m_pMachineLogic(0)
+#ifdef Q_WS_MAC
+        , m_fadeToken(kCGDisplayFadeReservationInvalidToken)
+#endif /* Q_WS_MAC */
     {
         /* Connect state-change handler: */
@@ -51 +60 @@
     virtual UIVisualStateType visualStateType() const = 0;
 
-    virtual bool prepareChange()
+    virtual bool prepareChange(UIVisualStateType previousVisualStateType)
     {
         m_pMachineLogic = UIMachineLogic::create(this, m_pSession, m_pActionsPool, visualStateType());
-        return m_pMachineLogic->checkAvailability();
+        bool fResult = m_pMachineLogic->checkAvailability();
+#ifdef Q_WS_MAC
+        /* If the new is or the old type was fullscreen we add the blending
+         * transition between the mode switches.
+         * TODO: make this more general. */
+        if (   fResult
+            && (   visualStateType() == UIVisualStateType_Fullscreen
+                || previousVisualStateType == UIVisualStateType_Fullscreen))
+        {
+            /* Fade to black */
+            CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &m_fadeToken);
+            CGDisplayFade(m_fadeToken, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, true);
+        }
+#else /* Q_WS_MAC */
+        Q_UNUSED(previousVisualStateType);
+#endif /* !Q_WS_MAC */
+        return fResult;
     }
 
     virtual void change() = 0;
-    virtual void finishChange() {}
+
+    virtual void finishChange()
+    {
+#ifdef Q_WS_MAC
+        /* If there is a valid fade token, fade back to normal color in any
+         * case. */
+        if (m_fadeToken != kCGDisplayFadeReservationInvalidToken)
+        {
+            /* Fade back to the normal gamma */
+            CGDisplayFade(m_fadeToken, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, false);
+            CGReleaseDisplayFadeReservation(m_fadeToken);
+            m_fadeToken = kCGDisplayFadeReservationInvalidToken;
+        }
+#endif /* Q_WS_MAC */
+    }
+
 
 signals:
@@ -71 +111 @@
     UIActionsPool *m_pActionsPool;
     UIMachineLogic *m_pMachineLogic;
+#ifdef Q_WS_MAC
+    CGDisplayFadeReservationToken m_fadeToken;
+#endif /* Q_WS_MAC */
 };
 
@@ -274 +317 @@
     }
 
+    UIVisualStateType previousVisualStateType = UIVisualStateType_Normal;
+    if (m_pVisualState)
+        previousVisualStateType = m_pVisualState->visualStateType();
+
     /* First we have to check if the selected mode is available at all.
      * Only then we delete the old mode and switch to the new mode. */
-    if (pNewVisualState->prepareChange())
+    if (pNewVisualState->prepareChange(previousVisualStateType))
     {
         /* Delete previous state: */

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

@@ -109 +109 @@
     }
 
-
     return true;
 }

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

@@ -178 +178 @@
             break;
         }
-#ifdef Q_WS_MAC
-        case QEvent::Polish:
-        {
-            /* Fade back to the normal gamma */
-//            CGDisplayFade (mFadeToken, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, false);
-//            CGReleaseDisplayFadeReservation (mFadeToken);
-            break;
-        }
-#endif /* Q_WS_MAC */
         default:
             break;
@@ -300 +291 @@
     setAutoFillBackground (true);
 
-#ifdef Q_WS_MAC
-    /* Fade to black */
-//    CGAcquireDisplayFadeReservation (kCGMaxDisplayReservationInterval, &mFadeToken);
-//    CGDisplayFade (mFadeToken, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, true);
-#endif
-
     /* We have to show the window early, or the position will be wrong on the
        Mac */

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

@@ -98 +98 @@
     //void cleanupConsoleConnections() {}
 
-#ifdef Q_WS_MAC
-    CGDisplayFadeReservationToken mFadeToken;
-#endif /* Q_WS_MAC */
-
     /* Other members: */
     QRect m_normalGeometry;