Changeset 45592 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2013 4:58:02 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center, popup-pane: Implementing main framework stuff (part 6).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupPane.cpp (modified) (18 diffs)
• UIPopupPane.h (modified) (3 diffs)

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

@@ -73 +73 @@
 }
 
+QStateMachine* UIAnimationFramework::installPropertyAnimation(QWidget *pTarget, const QByteArray &strPropertyName,
+                                                              const QByteArray &strValuePropertyNameStart, const QByteArray &strValuePropertyNameFinal,
+                                                              const char *pSignalForward, const char *pSignalBackward,
+                                                              bool fReversive /*= 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, strPropertyName, pStateMachine);
+    pForwardAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
+    pForwardAnimation->setDuration(iAnimationDuration);
+    pForwardAnimation->setStartValue(pTarget->property(strValuePropertyNameStart));
+    pForwardAnimation->setEndValue(pTarget->property(strValuePropertyNameFinal));
+    /* State-machine 'backward' animation: */
+    QPropertyAnimation *pBackwardAnimation = new QPropertyAnimation(pTarget, strPropertyName, pStateMachine);
+    pBackwardAnimation->setEasingCurve(QEasingCurve(QEasingCurve::InOutCubic));
+    pBackwardAnimation->setDuration(iAnimationDuration);
+    pBackwardAnimation->setStartValue(pTarget->property(strValuePropertyNameFinal));
+    pBackwardAnimation->setEndValue(pTarget->property(strValuePropertyNameStart));
+
+    /* 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;
+}
+
 
 /* Popup-pane frame prototype class: */
@@ -82 +121 @@
 signals:
 
-    /* Notifiers: Animation stuff: */
+    /* Notifiers: Parent propagation stuff: */
     void sigHoverEnter();
     void sigHoverLeave();
@@ -119 +158 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(int percentage READ percentage WRITE setPercentage);
 
 signals:
 
-    /* Notifier: Animation stuff: */
-    void sigHoverEnter();
-    void sigHoverLeave();
+    /* Notifiers: Parent propagation stuff: */
     void sigFocusEnter();
     void sigFocusLeave();
-    void sigGeometryChanged();
+
+    /* Notifier: Animation stuff: */
+    void sigSizeChanged();
 
 public:
@@ -142 +180 @@
     void setDesiredWidth(int iDesiredWidth);
 
-    /* API: Minimum size-hint stuff: */
+    /* API: Size-hint stuff: */
     QSize minimumSizeHint() const;
-
+    QSize sizeHint() const;
+
+private slots:
+
+    /* Handlers: Animation stuff: */
+    void sltFocusEnter();
+    void sltFocusLeave();
+    
 private:
 
@@ -154 +199 @@
     void prepareContent();
 
-    /* Property: Hover stuff: */
-    int percentage() const { return m_iPercentage; }
-    void setPercentage(int iPercentage);
+    /* Helper: Size-hint stuff: */
+    void updateGeometry();
+
+    /* Handler: Animation stuff: */
+    void resizeEvent(QResizeEvent *pEvent);
 
     /* Variables: Label stuff: */
@@ -162 +209 @@
     int m_iDesiredWidth;
 
-    /* Variables: Hover stuff: */
-    const int m_iHoverAnimationDuration;
-    const int m_iDefaultPercentage;
-    const int m_iHoveredPercentage;
-    int m_iPercentage;
+    /* Variables: Size-hint stuff: */
+    QSize m_minimumSizeHint;
+    QSize m_sizeHint;
+
+    /* Variables: Animation stuff: */
+    bool m_fFocused;
+    QObject *m_pAnimation;
 };
 
@@ -225 +274 @@
     const int iHeight = parentWidget()->height();
 
-    /* Adjust text-pane according parent width: */
-    if (m_pTextPane)
-    {
-        m_pTextPane->setDesiredWidth(iWidth - 2 * m_iMainLayoutMargin
-                                            - 2 * m_iMainFrameLayoutMargin
-                                            - m_pButtonBox->minimumSizeHint().width());
-    }
-
     /* Resize popup according parent width: */
     resize(iWidth, minimumSizeHint().height());
@@ -268 +309 @@
 
         /* Adjust geometry: */
-        sltAdjustGeomerty();
+        adjustGeometry();
     }
     /* Other objects subscribed for hovering: */
@@ -341 +382 @@
 {
     /* Adjust geometry: */
-    sltAdjustGeomerty();
+    adjustGeometry();
 }
 
@@ -368 +409 @@
         {
             /* Take into account widgets: */
-            iMinimumWidthHint += m_pTextPane->minimumSizeHint().width();
+            iMinimumWidthHint += m_pTextPane->width();
             iMinimumWidthHint += m_iMainFrameLayoutSpacing;
             iMinimumWidthHint += m_pButtonBox->minimumSizeHint().width();
@@ -390 +431 @@
         {
             /* Take into account widgets: */
-            const int iTextPaneHeight = m_pTextPane->minimumSizeHint().height();
+            const int iTextPaneHeight = m_pTextPane->height();
             const int iButtonBoxHeight = m_pButtonBox->minimumSizeHint().height();
             iMinimumHeightHint += qMax(iTextPaneHeight, iButtonBoxHeight);
@@ -403 +444 @@
 {
     return QSize(minimumWidthHint(), minimumHeightHint());
+}
+
+void UIPopupPane::adjustGeometry()
+{
+    /* Get parent width: */
+    const int iWidth = parentWidget()->width();
+
+    /* Adjust text-pane according parent width: */
+    if (m_pTextPane)
+    {
+        m_pTextPane->setDesiredWidth(iWidth - 2 * m_iMainLayoutMargin
+                                            - 2 * m_iMainFrameLayoutMargin
+                                            - m_pButtonBox->minimumSizeHint().width());
+    }
+
+    /* Adjust other widgets: */
+    sltAdjustGeomerty();
 }
 
@@ -420 +478 @@
         /* Main-frame layout: */
         {
+            /* Variables: */
+            const int iTextPaneWidth = m_pTextPane->width();
+            const int iTextPaneHeight = m_pTextPane->height();
+            const QSize buttonBoxMinimumSizeHint = m_pButtonBox->minimumSizeHint();
+            const int iButtonBoxWidth = buttonBoxMinimumSizeHint.width();
+            const int iButtonBoxHeight = buttonBoxMinimumSizeHint.height();
+            const int iMaximumHeight = qMax(iTextPaneHeight, iButtonBoxHeight);
+            const int iMinimumHeight = qMin(iTextPaneHeight, iButtonBoxHeight);
+            const int iHeightShift = (iMaximumHeight - iMinimumHeight) / 2;
+            const bool fTextPaneShifted = iTextPaneHeight < iButtonBoxHeight;
             /* Text-pane: */
-            const int iTextPaneWidth = m_pTextPane->minimumSizeHint().width();
             m_pTextPane->move(m_iMainFrameLayoutMargin,
-                              m_iMainFrameLayoutMargin);
-            m_pTextPane->resize(iTextPaneWidth,
-                                iMainFrameHeight - 2 * m_iMainFrameLayoutMargin);
+                              fTextPaneShifted ? m_iMainFrameLayoutMargin + iHeightShift : m_iMainFrameLayoutMargin);
+            m_pTextPane->resize(iTextPaneWidth, iTextPaneHeight);
             /* Button-box: */
-            const int iButtonBoxWidth = m_pButtonBox->minimumSizeHint().width();
             m_pButtonBox->move(m_iMainFrameLayoutMargin + iTextPaneWidth + m_iMainFrameLayoutSpacing,
                                m_iMainFrameLayoutMargin);
@@ -450 +515 @@
         {
             /* Prepare label: */
-            connect(m_pTextPane, SIGNAL(sigGeometryChanged()),
+            connect(m_pTextPane, SIGNAL(sigSizeChanged()),
                     this, SLOT(sltAdjustGeomerty()));
             m_pTextPane->installEventFilter(this);
@@ -660 +725 @@
     , m_pLabel(0)
     , m_iDesiredWidth(-1)
-    , m_iHoverAnimationDuration(300)
-    , m_iDefaultPercentage(1)
-    , m_iHoveredPercentage(100)
-    , m_iPercentage(m_iDefaultPercentage)
+    , m_fFocused(false)
+    , m_pAnimation(0)
 {
     /* Prepare: */
@@ -700 +763 @@
     if (m_iDesiredWidth >= 0)
         /* Return dependent size-hint: */
-        return QSize(m_iDesiredWidth, (int)(((qreal)percentage() / 100) * m_pLabel->heightForWidth(m_iDesiredWidth)));
+        return m_minimumSizeHint;
+    /* Return golden-rule minimum size-hint by default: */
+    return m_pLabel->minimumSizeHint();
+}
+
+QSize UIPopupPaneTextPane::sizeHint() const
+{
+    /* Check if desired-width set: */
+    if (m_iDesiredWidth >= 0)
+        /* Return dependent size-hint: */
+        return m_sizeHint;
     /* Return golden-rule size-hint by default: */
-    return m_pLabel->minimumSizeHint();
+    return m_pLabel->sizeHint();
+}
+
+void UIPopupPaneTextPane::sltFocusEnter()
+{
+    if (!m_fFocused)
+    {
+        m_fFocused = true;
+        emit sigFocusEnter();
+    }
+}
+
+void UIPopupPaneTextPane::sltFocusLeave()
+{
+    if (m_fFocused)
+    {
+        m_fFocused = false;
+        emit sigFocusLeave();
+    }
 }
 
@@ -708 +799 @@
 {
     /* Propagate parent signals: */
-    connect(parent(), SIGNAL(sigHoverEnter()), this, SIGNAL(sigHoverEnter()));
-    connect(parent(), SIGNAL(sigHoverLeave()), this, SIGNAL(sigHoverLeave()));
-    connect(parent(), SIGNAL(sigFocusEnter()), this, SIGNAL(sigFocusEnter()));
-    connect(parent(), SIGNAL(sigFocusLeave()), this, SIGNAL(sigFocusLeave()));
-    /* Install 'focus' animation for 'height' property: */
-    UIAnimationFramework::installPropertyAnimation(this, QByteArray("percentage"),
-                                                   m_iDefaultPercentage, m_iHoveredPercentage, m_iHoverAnimationDuration,
-                                                   SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
+    connect(parent(), SIGNAL(sigFocusEnter()), this, SLOT(sltFocusEnter()));
+    connect(parent(), SIGNAL(sigFocusLeave()), this, SLOT(sltFocusLeave()));
     /* Prepare content: */
     prepareContent();
@@ -744 +829 @@
             m_pLabel->setWordWrap(true);
         }
-        /* Activate layout: */
-        updateGeometry();
-    }
-}
-
-void UIPopupPaneTextPane::setPercentage(int iPercentage)
-{
-    m_iPercentage = iPercentage;
-    updateGeometry();
-    emit sigGeometryChanged();
+    }
+}
+
+void UIPopupPaneTextPane::updateGeometry()
+{
+    /* Recalculate size-hints: */
+    QFontMetrics fm(m_pLabel->font(), m_pLabel);
+    m_sizeHint = QSize(m_iDesiredWidth, m_pLabel->heightForWidth(m_iDesiredWidth));
+    m_minimumSizeHint = QSize(m_iDesiredWidth, fm.height());
+    /* Update geometry: */
+    QWidget::updateGeometry();
+    /* Resize to required size: */
+    resize(m_fFocused ? sizeHint() : minimumSizeHint());
+    /* Reinstall animation: */
+    delete m_pAnimation;
+    m_pAnimation = UIAnimationFramework::installPropertyAnimation(this, "size", "minimumSizeHint", "sizeHint",
+                                                                  SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()),
+                                                                  m_fFocused);
+}
+
+void UIPopupPaneTextPane::resizeEvent(QResizeEvent*)
+{
+    emit sigSizeChanged();
 }
 

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

@@ -27 +27 @@
 
 /* Forward declaration: */
+class QStateMachine;
 class QLabel;
 class QPushButton;
@@ -41 +42 @@
                                   int iStartValue, int iFinalValue, int iAnimationDuration,
                                   const char *pSignalForward, const char *pSignalBackward);
+
+    /* API: Animation stuff: */
+    QStateMachine* installPropertyAnimation(QWidget *pTarget, const QByteArray &strPropertyName,
+                                            const QByteArray &strValuePropertyNameStart, const QByteArray &strValuePropertyNameFinal,
+                                            const char *pSignalForward, const char *pSignalBackward,
+                                            bool fReversive = false, int iAnimationDuration = 300);
 }
 
@@ -103 +110 @@
     int minimumHeightHint() const;
     QSize minimumSizeHint() const;
+    void adjustGeometry();
     void updateLayout();