Changeset 79389 in vbox for trunk/src/VBox

Timestamp:

Jun 27, 2019 12:30:53 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: Graphics Scroll Area: Make scroll step HiDPI aware.

Location:

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

Files:

• UIGraphicsScrollArea.cpp (modified) (2 diffs)
• UIGraphicsScrollBar.cpp (modified) (4 diffs)
• UIGraphicsScrollBar.h (modified) (2 diffs)

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

@@ -167 +167 @@
             {
                 if (angleDelta.x() > 0)
+#ifdef VBOX_WS_MAC
+                    m_pScrollBar->setValue(m_pScrollBar->value() - pixelDelta.y());
+#else
                     m_pScrollBar->setValue(m_pScrollBar->value() - m_pScrollBar->step());
+#endif
                 else if (angleDelta.x() < 0)
+#ifdef VBOX_WS_MAC
+                    m_pScrollBar->setValue(m_pScrollBar->value() - pixelDelta.y());
+#else
                     m_pScrollBar->setValue(m_pScrollBar->value() + m_pScrollBar->step());
+#endif
                 break;
             }
@@ -229 +237 @@
     if (m_pScrollBar)
     {
-        m_pScrollBar->setStep(10);
         m_pScrollBar->setZValue(1);
         connect(m_pScrollBar, &UIGraphicsScrollBar::sigValueChanged,

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

@@ -208 +208 @@
     : m_enmOrientation(enmOrientation)
     , m_iExtent(-1)
-    , m_iStep(1)
     , m_iMinimum(0)
     , m_iMaximum(100)
@@ -234 +233 @@
     , m_enmOrientation(enmOrientation)
     , m_iExtent(-1)
-    , m_iStep(1)
     , m_iMinimum(0)
     , m_iMaximum(100)
@@ -268 +266 @@
 }
 
-void UIGraphicsScrollBar::setStep(int iStep)
-{
-    m_iStep = iStep;
-}
-
 int UIGraphicsScrollBar::step() const
 {
-    return m_iStep;
+    return 2 * QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
 }
 
@@ -453 +446 @@
 void UIGraphicsScrollBar::sltButton1Clicked()
 {
-    setValue(value() - m_iStep);
+    setValue(value() - step());
 }
 
 void UIGraphicsScrollBar::sltButton2Clicked()
 {
-    setValue(value() + m_iStep);
+    setValue(value() + step());
 }
 

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

@@ -67 +67 @@
     virtual QSizeF minimumSizeHint() const /* override */;
 
-    /** Defines scrolling @a iStep. */
-    void setStep(int iStep);
     /** Returns scrolling step. */
     int step() const;
@@ -186 +184 @@
     int  m_iExtent;
 
-    /** Holds the scrolling step. */
-    int  m_iStep;
-
     /** Holds the minimum scroll-bar value. */
     int  m_iMinimum;