Changeset 77923 in vbox for trunk/src

Timestamp:

Mar 27, 2019 2:43:18 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Restore lost drag scrolling functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/chooser/UIChooserItemGroup.cpp (modified) (1 diff)
• manager/chooser/UIChooserItemGroup.h (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)
• widgets/graphics/UIGraphicsScrollArea.cpp (modified) (1 diff)
• widgets/graphics/UIGraphicsScrollArea.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -140 +140 @@
 }
 
+void UIChooserItemGroup::scrollBy(int iDelta)
+{
+    m_pScrollArea->scrollBy(iDelta);
+}
+
 void UIChooserItemGroup::makeSureItemIsVisible(UIChooserItem *pItem)
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

@@ -90 +90 @@
     /** @name Navigation stuff.
       * @{ */
+        /** Performs scrolling by @a iDelta pixels. */
+        void scrollBy(int iDelta);
+
         /** Makes sure passed @a pItem is visible within the current root item.
           * @note Please keep in mind that any group item can be a root, but there

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1087 +1087 @@
 void UIChooserModel::sltStartScrolling()
 {
+    /* Make sure view exists: */
+    AssertPtrReturnVoid(view());
+
     /* Should we scroll? */
     if (!m_fIsScrollingInProgress)
@@ -1094 +1097 @@
     m_fIsScrollingInProgress = false;
 
-    /* Get view/scrollbar: */
-    QGraphicsView *pView = view();
-    QScrollBar *pVerticalScrollBar = pView->verticalScrollBar();
-
     /* Convert mouse position to view co-ordinates: */
-    const QPoint mousePos = pView->mapFromGlobal(QCursor::pos());
+    const QPoint mousePos = view()->mapFromGlobal(QCursor::pos());
     /* Mouse position is at the top of view? */
     if (mousePos.y() < m_iScrollingTokenSize && mousePos.y() > 0)
     {
         int iValue = mousePos.y();
-        if (!iValue) iValue = 1;
-        int iDelta = m_iScrollingTokenSize / iValue;
-        if (pVerticalScrollBar->value() > pVerticalScrollBar->minimum())
-        {
-            /* Backward scrolling: */
-            pVerticalScrollBar->setValue(pVerticalScrollBar->value() - 2 * iDelta);
-            m_fIsScrollingInProgress = true;
-            QTimer::singleShot(10, this, SLOT(sltStartScrolling()));
-        }
+        if (!iValue)
+            iValue = 1;
+        const int iDelta = m_iScrollingTokenSize / iValue;
+        /* Backward scrolling: */
+        root()->toGroupItem()->scrollBy(- 2 * iDelta);
+        m_fIsScrollingInProgress = true;
+        QTimer::singleShot(10, this, SLOT(sltStartScrolling()));
     }
     /* Mouse position is at the bottom of view? */
-    else if (mousePos.y() > pView->height() - m_iScrollingTokenSize && mousePos.y() < pView->height())
-    {
-        int iValue = pView->height() - mousePos.y();
-        if (!iValue) iValue = 1;
-        int iDelta = m_iScrollingTokenSize / iValue;
-        if (pVerticalScrollBar->value() < pVerticalScrollBar->maximum())
-        {
-            /* Forward scrolling: */
-            pVerticalScrollBar->setValue(pVerticalScrollBar->value() + 2 * iDelta);
-            m_fIsScrollingInProgress = true;
-            QTimer::singleShot(10, this, SLOT(sltStartScrolling()));
-        }
+    else if (mousePos.y() > view()->height() - m_iScrollingTokenSize && mousePos.y() < view()->height())
+    {
+        int iValue = view()->height() - mousePos.y();
+        if (!iValue)
+            iValue = 1;
+        const int iDelta = m_iScrollingTokenSize / iValue;
+        /* Forward scrolling: */
+        root()->toGroupItem()->scrollBy(2 * iDelta);
+        m_fIsScrollingInProgress = true;
+        QTimer::singleShot(10, this, SLOT(sltStartScrolling()));
     }
 }
@@ -1600 +1595 @@
 bool UIChooserModel::processDragMoveEvent(QGraphicsSceneDragDropEvent *pEvent)
 {
+    /* Make sure view exists: */
+    AssertPtrReturn(view(), false);
+
     /* Do we scrolling already? */
     if (m_fIsScrollingInProgress)
         return false;
 
-    /* Get view: */
-    QGraphicsView *pView = view();
-
     /* Check scroll-area: */
-    const QPoint eventPoint = pView->mapFromGlobal(pEvent->screenPos());
-    if ((eventPoint.y() < m_iScrollingTokenSize) ||
-        (eventPoint.y() > pView->height() - m_iScrollingTokenSize))
+    const QPoint eventPoint = view()->mapFromGlobal(pEvent->screenPos());
+    if (   (eventPoint.y() < m_iScrollingTokenSize)
+        || (eventPoint.y() > view()->height() - m_iScrollingTokenSize))
     {
         /* Set scrolling in progress: */

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

@@ -96 +96 @@
 {
     return m_pViewport;
+}
+
+void UIGraphicsScrollArea::scrollBy(int iDelta)
+{
+    m_pScrollBar->setValue(m_pScrollBar->value() + iDelta);
 }
 

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

@@ -50 +50 @@
     QIGraphicsWidget *viewport() const;
 
+    /** Performs scrolling by @a iDelta pixels. */
+    void scrollBy(int iDelta);
+
     /** Makes sure passed @a rect is visible. */
     void makeSureRectIsVisible(const QRectF &rect);