Changeset 77285 in vbox

Timestamp:

Feb 12, 2019 3:46:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9373: A bit of refactoring for UIGraphicsScrollBar to make it ready for other animation types (like stuff required for macOS).

Location:

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

Files:

• UIGraphicsScrollBar.cpp (modified) (12 diffs)
• UIGraphicsScrollBar.h (modified) (4 diffs)

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

@@ -218 +218 @@
     , m_iHoverOnTimerId(0)
     , m_iHoverOffTimerId(0)
-    , m_iAnimatedValue(0)
+    , m_iHoveringValue(0)
 {
     pScene->addItem(this);
@@ -238 +238 @@
     , m_iHoverOnTimerId(0)
     , m_iHoverOffTimerId(0)
-    , m_iAnimatedValue(0)
+    , m_iHoveringValue(0)
 {
     prepare();
@@ -579 +579 @@
 void UIGraphicsScrollBar::prepareAnimation()
 {
+    prepareHoveringAnimation();
+}
+
+void UIGraphicsScrollBar::prepareHoveringAnimation()
+{
     /* Create hovering animation machine: */
     QStateMachine *pHoveringMachine = new QStateMachine(this);
@@ -591 +596 @@
         if (pStateDefault)
         {
-            /* When we entering default state => we assigning animatedValue to 0: */
-            pStateDefault->assignProperty(this, "animatedValue", 0);
+            /* When we entering default state => we assigning hoveringValue to 0: */
+            pStateDefault->assignProperty(this, "hoveringValue", 0);
             connect(pStateDefault, &QState::propertiesAssigned, this, &UIGraphicsScrollBar::sltStateEnteredDefault);
 
@@ -602 +607 @@
 
                 /* Create forward animation: */
-                QPropertyAnimation *pHoveringAnimationForward = new QPropertyAnimation(this, "animatedValue", this);
+                QPropertyAnimation *pHoveringAnimationForward = new QPropertyAnimation(this, "hoveringValue", this);
                 if (pHoveringAnimationForward)
                 {
@@ -618 +623 @@
         if (pStateHovered)
         {
-            /* When we entering hovered state => we assigning animatedValue to 100: */
-            pStateHovered->assignProperty(this, "animatedValue", 100);
+            /* When we entering hovered state => we assigning hoveringValue to 100: */
+            pStateHovered->assignProperty(this, "hoveringValue", 100);
             connect(pStateHovered, &QState::propertiesAssigned, this, &UIGraphicsScrollBar::sltStateEnteredHovered);
 
@@ -629 +634 @@
 
                 /* Create backward animation: */
-                QPropertyAnimation *pHoveringAnimationBackward = new QPropertyAnimation(this, "animatedValue", this);
+                QPropertyAnimation *pHoveringAnimationBackward = new QPropertyAnimation(this, "hoveringValue", this);
                 if (pHoveringAnimationBackward)
                 {
@@ -748 +753 @@
     pPainter->save();
     QColor windowColor = pal.color(QPalette::Active, QPalette::Window);
-    windowColor.setAlpha(255 * ((double)m_iAnimatedValue / 100));
+    windowColor.setAlpha(255 * ((double)m_iHoveringValue / 100));
     pPainter->fillRect(rectangle, windowColor);
     pPainter->restore();
@@ -755 +760 @@
     pPainter->save();
     QColor frameColor = pal.color(QPalette::Active, QPalette::Window);
-    frameColor.setAlpha(255 * ((double)m_iAnimatedValue / 100));
+    frameColor.setAlpha(255 * ((double)m_iHoveringValue / 100));
     frameColor = frameColor.darker(120);
     pPainter->setPen(frameColor);
@@ -762 +767 @@
 
     /* Emulate token when necessary: */
-    if (m_iAnimatedValue < 100)
+    if (m_iHoveringValue < 100)
     {
         QColor tokenColor = pal.color(QPalette::Active, QPalette::Mid);
@@ -768 +773 @@
         QRectF tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, 2 * m_iExtent));
         QRectF actualRectangle = tokenRectangle;
-        actualRectangle.setLeft(tokenRectangle.left() + .22 * tokenRectangle.width() + .22 * tokenRectangle.width() * ((double)100 - m_iAnimatedValue) / 100);
-        actualRectangle.setRight(tokenRectangle.right() - .22 * tokenRectangle.width() + .22 * tokenRectangle.width() * ((double)100 - m_iAnimatedValue) / 100 - 1);
+        actualRectangle.setLeft(tokenRectangle.left() + .22 * tokenRectangle.width() + .22 * tokenRectangle.width() * ((double)100 - m_iHoveringValue) / 100);
+        actualRectangle.setRight(tokenRectangle.right() - .22 * tokenRectangle.width() + .22 * tokenRectangle.width() * ((double)100 - m_iHoveringValue) / 100 - 1);
         const double dRadius = actualRectangle.width() / 2;
         QPainterPath painterPath = QPainterPath(QPoint(actualRectangle.x(), actualRectangle.y() + dRadius));
@@ -786 +791 @@
     backgroundColor.setAlpha(200);
     QRect actualRectangle = rectangle;
-    actualRectangle.setLeft(actualRectangle.left() + .9 * actualRectangle.width() * ((double)100 - m_iAnimatedValue) / 100);
+    actualRectangle.setLeft(actualRectangle.left() + .9 * actualRectangle.width() * ((double)100 - m_iHoveringValue) / 100);
     pPainter->fillRect(actualRectangle, backgroundColor);
 
     /* Emulate token when necessary: */
-    if (m_iAnimatedValue < 100)
+    if (m_iHoveringValue < 100)
     {
         QColor tokenColor = pal.color(QPalette::Active, QPalette::Window);
         tokenColor.setAlpha(200);
         QRect tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, m_iExtent));
-        tokenRectangle.setLeft(tokenRectangle.left() + .9 * tokenRectangle.width() * ((double)100 - m_iAnimatedValue) / 100);
+        tokenRectangle.setLeft(tokenRectangle.left() + .9 * tokenRectangle.width() * ((double)100 - m_iHoveringValue) / 100);
         pPainter->fillRect(tokenRectangle, tokenColor);
     }

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

@@ -34 +34 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(int animatedValue READ animatedValue WRITE setAnimatedValue);
+    Q_PROPERTY(int hoveringValue READ hoveringValue WRITE setHoveringValue);
 
 signals:
@@ -127 +127 @@
     /** Prepares animation. */
     void prepareAnimation();
+    /** Prepares hovering animation. */
+    void prepareHoveringAnimation();
 
     /** Updates scroll-bar extent value. */
@@ -143 +145 @@
     void paintBackground(QPainter *pPainter, const QRect &rectangle) const;
 
-    /** Defines item's animated @a iValue. */
-    void setAnimatedValue(int iValue) { m_iAnimatedValue = iValue; update(); }
-    /** Returns item's animated value. */
-    int animatedValue() const { return m_iAnimatedValue; }
+    /** Defines hovering animation @a iValue. */
+    void setHoveringValue(int iValue) { m_iHoveringValue = iValue; update(); }
+    /** Returns hovering animation value. */
+    int hoveringValue() const { return m_iHoveringValue; }
 
     /** Holds the orientation. */
@@ -177 +179 @@
     /** Holds the hover-off timer id. */
     int   m_iHoverOffTimerId;
-    /** Holds the animated value. */
-    int   m_iAnimatedValue;
+    /** Holds the hovering animation value. */
+    int   m_iHoveringValue;
 };