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

Timestamp:

May 23, 2013 3:16:35 PM (12 years ago)

Author:

vboxsync

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

85971

Message:

FE/Qt: Animation framework rework.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIAnimationFramework.cpp (modified) (1 diff)
• src/globals/UIAnimationFramework.h (modified) (1 diff)
• src/widgets/UIPopupPane.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -272 +272 @@
         src/extensions/graphics/QIGraphicsWidget.h \
         src/globals/UIActionPool.h \
+        src/globals/UIAnimationFramework.h \
         src/globals/UIExtraDataEventHandler.h \
         src/globals/UIMainEventListener.h \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp

@@ -27 +27 @@
 #include "UIAnimationFramework.h"
 
-QStateMachine* UIAnimationFramework::installPropertyAnimation(QWidget *pTarget, const char *pszPropertyName,
-                                                              const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
-                                                              const char *pSignalForward, const char *pSignalBackward,
-                                                              bool fReversive /*= false*/, int iAnimationDuration /*= 300*/)
+/* static */
+UIAnimation* UIAnimation::installPropertyAnimation(QWidget *pTarget, const char *pszPropertyName,
+                                                   const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
+                                                   const char *pszSignalForward, const char *pszSignalReverse,
+                                                   bool fReverse /*= false*/, int iAnimationDuration /*= 300*/)
 {
-    /* State-machine: */
-    QStateMachine *pStateMachine = new QStateMachine(pTarget);
-    /* State-machine 'start' state: */
-    QState *pStateStart = new QState(pStateMachine);
-    /* State-machine 'final' state: */
-    QState *pStateFinal = new QState(pStateMachine);
-
-    /* State-machine 'forward' animation: */
-    QPropertyAnimation *pForwardAnimation = new QPropertyAnimation(pTarget, pszPropertyName, pStateMachine);
-    pForwardAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
-    pForwardAnimation->setDuration(iAnimationDuration);
-    pForwardAnimation->setStartValue(pTarget->property(pszValuePropertyNameStart));
-    pForwardAnimation->setEndValue(pTarget->property(pszValuePropertyNameFinal));
-    /* State-machine 'backward' animation: */
-    QPropertyAnimation *pBackwardAnimation = new QPropertyAnimation(pTarget, pszPropertyName, pStateMachine);
-    pBackwardAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
-    pBackwardAnimation->setDuration(iAnimationDuration);
-    pBackwardAnimation->setStartValue(pTarget->property(pszValuePropertyNameFinal));
-    pBackwardAnimation->setEndValue(pTarget->property(pszValuePropertyNameStart));
-
-    /* State-machine state transitions: */
-    QSignalTransition *pDefaultToHovered = pStateStart->addTransition(pTarget, pSignalForward, pStateFinal);
-    pDefaultToHovered->addAnimation(pForwardAnimation);
-    QSignalTransition *pHoveredToDefault = pStateFinal->addTransition(pTarget, pSignalBackward, pStateStart);
-    pHoveredToDefault->addAnimation(pBackwardAnimation);
-
-    /* Initial state is 'start': */
-    pStateMachine->setInitialState(!fReversive ? pStateStart : pStateFinal);
-    /* Start hover-machine: */
-    pStateMachine->start();
-    /* Return machine: */
-    return pStateMachine;
+    /* Return newly created animation-machine: */
+    return new UIAnimation(pTarget, pszPropertyName,
+                           pszValuePropertyNameStart, pszValuePropertyNameFinal,
+                           pszSignalForward, pszSignalReverse,
+                           fReverse, iAnimationDuration);
 }
 
+UIAnimation::UIAnimation(QWidget *pParent, const char *pszPropertyName,
+                         const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
+                         const char *pszSignalForward, const char *pszSignalReverse,
+                         bool fReverse, int iAnimationDuration)
+    : QObject(pParent)
+    , m_pszPropertyName(pszPropertyName)
+    , m_pszValuePropertyNameStart(pszValuePropertyNameStart), m_pszValuePropertyNameFinal(pszValuePropertyNameFinal)
+    , m_pszSignalForward(pszSignalForward), m_pszSignalReverse(pszSignalReverse)
+    , m_fReverse(fReverse), m_iAnimationDuration(iAnimationDuration)
+    , m_pAnimationMachine(0), m_pForwardAnimation(0), m_pReverseAnimation(0)
+{
+    /* Prepare: */
+    prepare();
+}
+
+void UIAnimation::prepare()
+{
+    /* Prepare animation-machine: */
+    m_pAnimationMachine = new QStateMachine(this);
+    /* Create 'start' and 'final' states: */
+    QState *pStateStart = new QState(m_pAnimationMachine);
+    QState *pStateFinal = new QState(m_pAnimationMachine);
+
+    /* Prepare 'forward' animation: */
+    m_pForwardAnimation = new QPropertyAnimation(parent(), m_pszPropertyName, m_pAnimationMachine);
+    m_pForwardAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
+    m_pForwardAnimation->setDuration(m_iAnimationDuration);
+    /* Prepare 'reverse' animation: */
+    m_pReverseAnimation = new QPropertyAnimation(parent(), m_pszPropertyName, m_pAnimationMachine);
+    m_pReverseAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
+    m_pReverseAnimation->setDuration(m_iAnimationDuration);
+
+    /* Prepare state-transitions: */
+    QSignalTransition *pStartToFinal = pStateStart->addTransition(parent(), m_pszSignalForward, pStateFinal);
+    pStartToFinal->addAnimation(m_pForwardAnimation);
+    QSignalTransition *pFinalToStart = pStateFinal->addTransition(parent(), m_pszSignalReverse, pStateStart);
+    pFinalToStart->addAnimation(m_pReverseAnimation);
+
+    /* Fetch animation-borders: */
+    update();
+
+    /* Choose initial state: */
+    m_pAnimationMachine->setInitialState(!m_fReverse ? pStateStart : pStateFinal);
+    /* Start animation-machine: */
+    m_pAnimationMachine->start();
+}
+
+void UIAnimation::update()
+{
+    /* Update 'forward' animation: */
+    m_pForwardAnimation->setStartValue(parent()->property(m_pszValuePropertyNameStart));
+    m_pForwardAnimation->setEndValue(parent()->property(m_pszValuePropertyNameFinal));
+    /* Update 'reverse' animation: */
+    m_pReverseAnimation->setStartValue(parent()->property(m_pszValuePropertyNameFinal));
+    m_pReverseAnimation->setEndValue(parent()->property(m_pszValuePropertyNameStart));
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.h

@@ -20 +20 @@
 #define __UIAnimationFramework_h__
 
+/* Qt includes: */
+#include <QObject>
+
 /* Forward declaration: */
 class QStateMachine;
+class QPropertyAnimation;
 
-/* UIAnimationFramework namespace: */
-namespace UIAnimationFramework
+/* UIAnimation factory: */
+class UIAnimation : public QObject
 {
-    /* API: Animation stuff: */
-    QStateMachine* installPropertyAnimation(QWidget *pTarget, const char *pszPropertyName,
-                                            const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
-                                            const char *pSignalForward, const char *pSignalBackward,
-                                            bool fReversive = false, int iAnimationDuration = 300);
-}
+    Q_OBJECT;
+
+public:
+
+    /* API: Factory stuff: */
+    static UIAnimation* installPropertyAnimation(QWidget *pTarget, const char *pszPropertyName,
+                                                 const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
+                                                 const char *pszSignalForward, const char *pszSignalReverse,
+                                                 bool fReverse = false, int iAnimationDuration = 300);
+
+    /* API: Update stuff: */
+    void update();
+
+protected:
+
+    /* Constructor: */
+    UIAnimation(QWidget *pParent, const char *pszPropertyName,
+                const char *pszValuePropertyNameStart, const char *pszValuePropertyNameFinal,
+                const char *pszSignalForward, const char *pszSignalReverse,
+                bool fReverse, int iAnimationDuration);
+
+private:
+
+    /* Helper: Prepare stuff: */
+    void prepare();
+
+    /* Variables: General stuff: */
+    const char *m_pszPropertyName;
+    const char *m_pszValuePropertyNameStart;
+    const char *m_pszValuePropertyNameFinal;
+    const char *m_pszSignalForward;
+    const char *m_pszSignalReverse;
+    bool m_fReverse;
+    int m_iAnimationDuration;
+
+    /* Variables: Animation-machine stuff: */
+    QStateMachine *m_pAnimationMachine;
+    QPropertyAnimation *m_pForwardAnimation;
+    QPropertyAnimation *m_pReverseAnimation;
+};
 
 #endif /* __UIAnimationFramework_h__ */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

@@ -34 +34 @@
 #include "UIAnimationFramework.h"
 
-/* Other VBox includes: */
-#include <VBox/sup.h>
-
 
 /* Popup-pane text-pane prototype class: */
@@ -115 +112 @@
     /* Variables: Focus stuff: */
     bool m_fFocused;
-    QObject *m_pAnimation;
+    UIAnimation *m_pAnimation;
 };
 
@@ -308 +305 @@
 {
     /* Install 'hover' animation for 'opacity' property: */
-    UIAnimationFramework::installPropertyAnimation(this, "opacity", "defaultOpacity", "hoveredOpacity",
-                                                   SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
+    UIAnimation::installPropertyAnimation(this, "opacity", "defaultOpacity", "hoveredOpacity",
+                                          SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
     /* Prepare content: */
     prepareContent();
@@ -589 +586 @@
     /* Prepare content: */
     prepareContent();
+    /* Install geometry animation for 'minimumSizeHint' property: */
+    m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
+                                                         SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
 }
 
@@ -658 +658 @@
     m_minimumSizeHint = m_fFocused ? m_expandedSizeHint : m_collapsedSizeHint;
 
-    /* And reinstall size-hint animation: */
-    delete m_pAnimation;
-    m_pAnimation = UIAnimationFramework::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
-                                                                  SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()),
-                                                                  m_fFocused);
+    /* Update animation: */
+    m_pAnimation->update();
 }