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

Timestamp:

Feb 12, 2019 6:56:16 PM (6 years ago)

Author:

vboxsync

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

128807

Message:

FE/Qt: bugref:9373: macOS: More native UIGraphicsScrollBar behavior (s.a. r128788).

Location:

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

Files:

• UIGraphicsScrollBar.cpp (modified) (7 diffs)
• UIGraphicsScrollBar.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp

@@ -219 +219 @@
     , m_iHoverOffTimerId(0)
     , m_iHoveringValue(0)
+#ifdef VBOX_WS_MAC
+    , m_fRevealed(false)
+    , m_iRevealingValue(0)
+    , m_iRevealOnTimerId(0)
+    , m_iRevealOffTimerId(0)
+#endif
 {
     pScene->addItem(this);
@@ -239 +245 @@
     , m_iHoverOffTimerId(0)
     , m_iHoveringValue(0)
+#ifdef VBOX_WS_MAC
+    , m_fRevealed(false)
+    , m_iRevealingValue(0)
+    , m_iRevealOnTimerId(0)
+    , m_iRevealOffTimerId(0)
+#endif
 {
     prepare();
@@ -407 +419 @@
         update();
     }
+
+#ifdef VBOX_WS_MAC
+
+    else
+
+    /* If that is reveal-in timer: */
+    if (m_iRevealOnTimerId != 0 && iTimerId == m_iRevealOnTimerId)
+    {
+        /* Wait for timer no more: */
+        m_iRevealOnTimerId = 0;
+    }
+
+    else
+
+    /* If that is reveal-out timer: */
+    if (m_iRevealOffTimerId != 0 && iTimerId == m_iRevealOffTimerId)
+    {
+        /* Wait for timer no more: */
+        m_iRevealOffTimerId = 0;
+        /* Emit reveal-out signal if not hovered or was reinvoked not long time ago: */
+        if (!m_fHovered && !m_pToken->isHovered() && m_iRevealOnTimerId == 0)
+            emit sigRevealLeave();
+        /* Restart timer otherwise: */
+        else
+            m_iRevealOffTimerId = startTimer(2000);
+        /* Update in any case: */
+        update();
+    }
+
+#endif
 }
 
@@ -506 +548 @@
         m_pToken->show();
 }
+
+#ifdef VBOX_WS_MAC
+void UIGraphicsScrollBar::sltHandleRevealingStart()
+{
+    /* Only if not yet revealed, that way we
+     * make sure trigger emitted just once: */
+    if (!m_fRevealed)
+    {
+        /* Mark token revealed: */
+        m_fRevealed = true;
+        /* Emit reveal signal immediately: */
+        emit sigRevealEnter();
+    }
+
+    /* Restart fresh sustain timer: */
+    m_iRevealOnTimerId = startTimer(1000);
+}
+
+void UIGraphicsScrollBar::sltStateEnteredFaded()
+{
+    /* Mark token faded: */
+    m_fRevealed = false;
+}
+
+void UIGraphicsScrollBar::sltStateEnteredRevealed()
+{
+    /* Start reveal-out timer: */
+    m_iRevealOffTimerId = startTimer(2000);
+}
+#endif /* VBOX_WS_MAC */
 
 void UIGraphicsScrollBar::prepare()
@@ -580 +652 @@
 {
     prepareHoveringAnimation();
+#ifdef VBOX_WS_MAC
+    prepareRevealingAnimation();
+#endif
 }
 
@@ -653 +728 @@
     }
 }
+
+#ifdef VBOX_WS_MAC
+void UIGraphicsScrollBar::prepareRevealingAnimation()
+{
+    /* Create revealing animation machine: */
+    QStateMachine *pRevealingMachine = new QStateMachine(this);
+    if (pRevealingMachine)
+    {
+        /* Create 'faded' state: */
+        QState *pStateFaded = new QState(pRevealingMachine);
+        /* Create 'revealed' state: */
+        QState *pStateRevealed = new QState(pRevealingMachine);
+
+        /* Configure 'faded' state: */
+        if (pStateFaded)
+        {
+            /* When we entering fade state => we assigning revealingValue to 0: */
+            pStateFaded->assignProperty(this, "revealingValue", 0);
+            connect(pStateFaded, &QState::propertiesAssigned, this, &UIGraphicsScrollBar::sltStateEnteredFaded);
+
+            /* Add state transitions: */
+            QSignalTransition *pFadeToRevealed = pStateFaded->addTransition(this, SIGNAL(sigRevealEnter()), pStateRevealed);
+            if (pFadeToRevealed)
+            {
+                /* Create forward animation: */
+                QPropertyAnimation *pRevealingAnimationForward = new QPropertyAnimation(this, "revealingValue", this);
+                if (pRevealingAnimationForward)
+                {
+                    pRevealingAnimationForward->setDuration(200);
+                    pRevealingAnimationForward->setStartValue(0);
+                    pRevealingAnimationForward->setEndValue(100);
+
+                    /* Add to transition: */
+                    pFadeToRevealed->addAnimation(pRevealingAnimationForward);
+                }
+            }
+        }
+
+        /* Configure 'revealed' state: */
+        if (pStateRevealed)
+        {
+            /* When we entering revealed state => we assigning revealingValue to 100: */
+            pStateRevealed->assignProperty(this, "revealingValue", 100);
+            connect(pStateRevealed, &QState::propertiesAssigned, this, &UIGraphicsScrollBar::sltStateEnteredRevealed);
+
+            /* Add state transitions: */
+            QSignalTransition *pRevealedToFaded = pStateRevealed->addTransition(this, SIGNAL(sigRevealLeave()), pStateFaded);
+            if (pRevealedToFaded)
+            {
+                /* Create backward animation: */
+                QPropertyAnimation *pRevealingAnimationBackward = new QPropertyAnimation(this, "revealingValue", this);
+                if (pRevealingAnimationBackward)
+                {
+                    pRevealingAnimationBackward->setDuration(200);
+                    pRevealingAnimationBackward->setStartValue(100);
+                    pRevealingAnimationBackward->setEndValue(0);
+
+                    /* Add to transition: */
+                    pRevealedToFaded->addAnimation(pRevealingAnimationBackward);
+                }
+            }
+        }
+
+        /* Initial state is 'fade': */
+        pRevealingMachine->setInitialState(pStateFaded);
+        /* Start state-machine: */
+        pRevealingMachine->start();
+    }
+
+    /* Install self-listener: */
+    connect(this, &UIGraphicsScrollBar::sigValueChanged, this, &UIGraphicsScrollBar::sltHandleRevealingStart);
+}
+#endif /* VBOX_WS_MAC */
 
 void UIGraphicsScrollBar::updateExtent()
@@ -770 +918 @@
     {
         QColor tokenColor = pal.color(QPalette::Active, QPalette::Mid);
+        tokenColor.setAlpha(255 * ((double)m_iRevealingValue / 100));
         tokenColor = tokenColor.darker(140);
         QRectF tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, 2 * m_iExtent));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.h

@@ -35 +35 @@
     Q_OBJECT;
     Q_PROPERTY(int hoveringValue READ hoveringValue WRITE setHoveringValue);
+#ifdef VBOX_WS_MAC
+    Q_PROPERTY(int revealingValue READ revealingValue WRITE setRevealingValue);
+#endif
 
 signals:
@@ -42 +45 @@
     /** Notifies listeners about hover leave. */
     void sigHoverLeave();
+
+#ifdef VBOX_WS_MAC
+    /** Notifies listeners about token should be revealed. */
+    void sigRevealEnter();
+    /** Notifies listeners about token should be faded. */
+    void sigRevealLeave();
+#endif
 
     /** Notifies listeners about @a iValue has changed. */
@@ -114 +124 @@
     /** Handles hovered state entering. */
     void sltStateEnteredHovered();
+
+#ifdef VBOX_WS_MAC
+    /** Handles signals to start revealing. */
+    void sltHandleRevealingStart();
+    /** Handles faded state entering. */
+    void sltStateEnteredFaded();
+    /** Handles revealed state entering. */
+    void sltStateEnteredRevealed();
+#endif
 
 private:
@@ -129 +148 @@
     /** Prepares hovering animation. */
     void prepareHoveringAnimation();
+#ifdef VBOX_WS_MAC
+    /** Prepares revealing animation. */
+    void prepareRevealingAnimation();
+#endif
 
     /** Updates scroll-bar extent value. */
@@ -150 +173 @@
     int hoveringValue() const { return m_iHoveringValue; }
 
+#ifdef VBOX_WS_MAC
+    /** Defines revealing animation @a iValue. */
+    void setRevealingValue(int iValue) { m_iRevealingValue = iValue; update(); }
+    /** Returns revealing animation value. */
+    int revealingValue() const { return m_iRevealingValue; }
+#endif
+
     /** Holds the orientation. */
     const Qt::Orientation  m_enmOrientation;
@@ -181 +211 @@
     /** Holds the hovering animation value. */
     int   m_iHoveringValue;
+
+#ifdef VBOX_WS_MAC
+    /** Holds whether token is revealed. */
+    bool  m_fRevealed;
+    /** Holds the revealing animation value. */
+    int   m_iRevealingValue;
+    /** Holds the reveal-out timer id. */
+    int   m_iRevealOnTimerId;
+    /** Holds the reveal-out timer id. */
+    int   m_iRevealOffTimerId;
+#endif
 };