Changeset 77203 in vbox for trunk/src/VBox

Timestamp:

Feb 7, 2019 5:06:17 PM (6 years ago)

Author:

vboxsync

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

128703

Message:

FE/Qt: bugref:9373: A bit of cleanup/rework for UIGraphicsScrollArea & UIGraphicsScrollBar for better scrolling experience.

Location:

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

Files:

• UIGraphicsScrollArea.cpp (modified) (3 diffs)
• UIGraphicsScrollBar.cpp (modified) (2 diffs)
• UIGraphicsScrollBar.h (modified) (1 diff)

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

@@ -117 +117 @@
             {
                 if (angleDelta.x() > 0)
-                    m_pScrollBar->setValue(m_pScrollBar->value() - m_pScrollBar->wheelStep());
-                else
-                    m_pScrollBar->setValue(m_pScrollBar->value() + m_pScrollBar->wheelStep());
+                    m_pScrollBar->setValue(m_pScrollBar->value() - m_pScrollBar->step());
+                else
+                    m_pScrollBar->setValue(m_pScrollBar->value() + m_pScrollBar->step());
                 break;
             }
@@ -126 +126 @@
             {
                 if (angleDelta.y() > 0)
-                    m_pScrollBar->setValue(m_pScrollBar->value() - m_pScrollBar->wheelStep());
-                else
-                    m_pScrollBar->setValue(m_pScrollBar->value() + m_pScrollBar->wheelStep());
+                    m_pScrollBar->setValue(m_pScrollBar->value() - m_pScrollBar->step());
+                else
+                    m_pScrollBar->setValue(m_pScrollBar->value() + m_pScrollBar->step());
                 break;
             }
@@ -171 +171 @@
     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

@@ -191 +191 @@
 }
 
-int UIGraphicsScrollBar::wheelStep() const
-{
-    return 10 * step();
-}
-
 void UIGraphicsScrollBar::setMinimum(int iMinimum)
 {
@@ -269 +264 @@
     /* Call to base-class: */
     QIGraphicsWidget::mousePressEvent(pEvent);
+
+    /* Mark event accepted so that it couldn't
+     * influence underlying widgets: */
+    pEvent->accept();
 
     /* Redirect to token move handler: */

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

@@ -55 +55 @@
     /** Returns scrolling step. */
     int step() const;
-    /** Returns scrolling wheel step. */
-    int wheelStep() const;
 
     /** Defines @a iMinimum scroll-bar value. */