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

Timestamp:

Feb 12, 2019 12:10:43 PM (6 years ago)

Author:

vboxsync

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

128787

Message:

FE/Qt: bugref:9373: Make UIGraphicsScroollBarToken orientation aware; make macOS token larger.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp (modified) (10 diffs)

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

@@ -48 +48 @@
 
     /** Constructs graphics scroll-bar token passing @a pParent to the base-class. */
-    UIGraphicsScrollBarToken(QIGraphicsWidget *pParent = 0);
+    UIGraphicsScrollBarToken(Qt::Orientation enmOrientation, QIGraphicsWidget *pParent = 0);
 
     /** Returns minimum size-hint. */
@@ -78 +78 @@
     void updateExtent();
 
+    /** Holds the orientation. */
+    const Qt::Orientation  m_enmOrientation;
+
     /** Holds the scroll-bar extent. */
     int  m_iExtent;
@@ -90 +93 @@
 *********************************************************************************************************************************/
 
-UIGraphicsScrollBarToken::UIGraphicsScrollBarToken(QIGraphicsWidget *pParent /* = 0 */)
+UIGraphicsScrollBarToken::UIGraphicsScrollBarToken(Qt::Orientation enmOrientation, QIGraphicsWidget *pParent /* = 0 */)
     : QIGraphicsWidget(pParent)
+    , m_enmOrientation(enmOrientation)
     , m_fHovered(false)
 {
@@ -99 +103 @@
 QSizeF UIGraphicsScrollBarToken::minimumSizeHint() const
 {
-    return QSizeF(m_iExtent, m_iExtent);
+    /* Calculate minimum size-hint depending on orientation: */
+    switch (m_enmOrientation)
+    {
+#ifdef VBOX_WS_MAC
+        case Qt::Horizontal: return QSizeF(2 * m_iExtent, m_iExtent);
+        case Qt::Vertical:   return QSizeF(m_iExtent, 2 * m_iExtent);
+#else
+        case Qt::Horizontal: return QSizeF(m_iExtent, m_iExtent);
+        case Qt::Vertical:   return QSizeF(m_iExtent, m_iExtent);
+#endif
+    }
+
+    /* Call to base-class: */
+    return QIGraphicsWidget::minimumSizeHint();
 }
 
@@ -392 +409 @@
 #ifdef VBOX_WS_MAC
             const int iMin = 0;
-            const int iMax = size().width() - m_iExtent;
+            const int iMax = size().width() - 2 * m_iExtent;
 #else
             const int iMin = m_iExtent;
@@ -409 +426 @@
 #ifdef VBOX_WS_MAC
             const int iMin = 0;
-            const int iMax = size().height() - m_iExtent;
+            const int iMax = size().height() - 2 * m_iExtent;
 #else
             const int iMin = m_iExtent;
@@ -533 +550 @@
 {
     /* Create token: */
-    m_pToken = new UIGraphicsScrollBarToken(this);
+    m_pToken = new UIGraphicsScrollBarToken(m_enmOrientation, this);
     if (m_pToken)
         connect(m_pToken, &UIGraphicsScrollBarToken::sigMouseMoved,
@@ -668 +685 @@
 #ifdef VBOX_WS_MAC
             const int iMin = 0;
-            const int iMax = size().width() - m_iExtent;
+            const int iMax = size().width() - 2 * m_iExtent;
 #else
             const int iMin = m_iExtent;
@@ -682 +699 @@
 #ifdef VBOX_WS_MAC
             const int iMin = 0;
-            const int iMax = size().height() - m_iExtent;
+            const int iMax = size().height() - 2 * m_iExtent;
 #else
             const int iMin = m_iExtent;
@@ -717 +734 @@
         QColor tokenColor = pal.color(QPalette::Active, QPalette::Window);
         tokenColor.setAlpha(200);
+#ifdef VBOX_WS_MAC
+        QRect tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, 2 * m_iExtent));
+#else
         QRect tokenRectangle = QRect(actualTokenPosition(), QSize(m_iExtent, m_iExtent));
+#endif
         tokenRectangle.setLeft(tokenRectangle.left() + .9 * tokenRectangle.width() * ((double)100 - m_iAnimatedValue) / 100);
         pPainter->fillRect(tokenRectangle, tokenColor);