Changeset 102262 in vbox for trunk

Timestamp:

Nov 22, 2023 3:19:20 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Make sure selector of UIAdvancedSettingsDialog is properly synchronized with actual scroll-area position.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UIAdvancedSettingsDialog.cpp (modified) (5 diffs)
• UIAdvancedSettingsDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -210 +210 @@
     Q_PROPERTY(int verticalScrollBarPosition READ verticalScrollBarPosition WRITE setVerticalScrollBarPosition);
 
+signals:
+
+    /** Notifies listeners about wheel-event. */
+    void sigWheelEvent();
+
 public:
 
@@ -227 +232 @@
     /** Returns the minimum widget size. */
     virtual QSize minimumSizeHint() const RT_OVERRIDE;
+
+    /** Handles wheel @a pEvent. */
+    virtual void wheelEvent(QWheelEvent *pEvent) RT_OVERRIDE;
 
 private:
@@ -568 +576 @@
                                 (int)(iMinWidth / 1.6));
     return QSize(iMinWidth, iMinHeight);
+}
+
+void UIVerticalScrollArea::wheelEvent(QWheelEvent *pEvent)
+{
+    /* Call to base-class: */
+    QScrollArea::wheelEvent(pEvent);
+
+    /* Notify listeners: */
+    emit sigWheelEvent();
 }
 
@@ -1136 +1153 @@
 }
 
+void UIAdvancedSettingsDialog::sltHandleVerticalScrollAreaWheelEvent()
+{
+    /* Acquire layout info: */
+    int iL = 0, iT = 0, iR = 0, iB = 0;
+    if (   m_pScrollViewport
+        && m_pScrollViewport->layout())
+        m_pScrollViewport->layout()->getContentsMargins(&iL, &iT, &iR, &iB);
+
+    /* Search through all the frame keys we have: */
+    int iActualKey = -1;
+    foreach (int iKey, m_frames.keys())
+    {
+        /* Let's calculate scroll-bar position for enumerated frame: */
+        int iPosition = 0;
+        /* We'll have to take upper content's margin into account: */
+        iPosition -= iT;
+        /* And actual page position according to parent: */
+        const QPoint pnt = m_frames.value(iKey)->pos();
+        iPosition += pnt.y();
+
+        /* Check if scroll-bar haven't passed this position yet: */
+        if (m_pScrollArea->verticalScrollBarPosition() < iPosition)
+            break;
+
+        /* Remember last suitable frame key: */
+        iActualKey = iKey;
+    }
+
+    /* Silently update the selector with frame number we found: */
+    if (iActualKey != -1)
+        m_pSelector->selectById(iActualKey, true /* silently */);
+}
+
 void UIAdvancedSettingsDialog::prepare()
 {
@@ -1233 +1283 @@
         m_pScrollArea->setWidgetResizable(true);
         m_pScrollArea->setFrameShape(QFrame::NoFrame);
+        connect(m_pScrollArea, &UIVerticalScrollArea::sigWheelEvent,
+                this, &UIAdvancedSettingsDialog::sltHandleVerticalScrollAreaWheelEvent);
 
         /* Prepare scroll-viewport: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.h

@@ -211 +211 @@
     void sltHandleFrameVisibilityChange(bool fVisible);
 
+    /** Handles signal about vertical scroll-area wheel-event. */
+    void sltHandleVerticalScrollAreaWheelEvent();
+
 private: