Changeset 105105 in vbox

Timestamp:

Jul 2, 2024 6:26:10 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Get rid of sticky scrolling, it's too hard to make it useful on every platform we want; Reworking scrolling to be more predictive, so that if scrollable widget it focused - it's being scrolled, otherwise main area being scrolled.

Location:

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

Files:

• UIAdvancedSettingsDialog.cpp (modified) (6 diffs)
• UIAdvancedSettingsDialog.h (modified) (2 diffs)

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

@@ -745 +745 @@
     , m_fValid(true)
     , m_fSilent(true)
-    , m_pScrollingTimer(0)
     , m_pLayoutMain(0)
     , m_pCheckBoxMode(0)
@@ -838 +837 @@
     if (pEvent->type() != QEvent::Wheel)
         return QMainWindow::eventFilter(pObject, pEvent);
+    /* Ignore events to anything but widgets in this handler: */
+    QWidget *pWidget = qobject_cast<QWidget*>(pObject);
+    if (!pWidget)
+        return QMainWindow::eventFilter(pObject, pEvent);
 
     /* Do not touch wheel events for m_pScrollArea or it's children: */
-    if (   pObject == m_pScrollArea
-        || pObject->parent() == m_pScrollArea)
-    {
-        /* Moreover restart 'sticky scrolling timer' during which
-         * all the scrolling will be redirected to m_pScrollViewport: */
-        m_pScrollingTimer->start();
-        return QMainWindow::eventFilter(pObject, pEvent);
-    }
+    if (   pWidget == m_pScrollArea
+        || pWidget->parent() == m_pScrollArea)
+        return QMainWindow::eventFilter(pWidget, pEvent);
 
     /* Unconditionally and for good
      * redirect wheel event for widgets of following types to m_pScrollViewport: */
-    if (   qobject_cast<QAbstractButton*>(pObject)
-        || qobject_cast<QAbstractSpinBox*>(pObject)
-        || qobject_cast<QAbstractSpinBox*>(pObject->parent())
-        || qobject_cast<QComboBox*>(pObject)
-        || qobject_cast<QSlider*>(pObject)
-        || qobject_cast<QTabWidget*>(pObject)
-        || qobject_cast<QTabWidget*>(pObject->parent()))
+    if (   qobject_cast<QAbstractButton*>(pWidget)
+        || qobject_cast<QAbstractSpinBox*>(pWidget)
+        || qobject_cast<QAbstractSpinBox*>(pWidget->parent())
+        || qobject_cast<QComboBox*>(pWidget)
+        || qobject_cast<QSlider*>(pWidget)
+        || qobject_cast<QTabWidget*>(pWidget)
+        || qobject_cast<QTabWidget*>(pWidget->parent()))
     {
         /* Check if redirected event was really handled, otherwise give it back: */
@@ -864 +862 @@
     }
 
-    /* While 'sticky scrolling timer' is active
-     * redirect wheel event for widgets of following types to m_pScrollViewport: */
-    if (   m_pScrollingTimer->isActive()
-        && (   qobject_cast<QAbstractScrollArea*>(pObject)
-            || qobject_cast<QAbstractScrollArea*>(pObject->parent())))
+    /* Unless widget of QAbstractScrollArea subclass is focused
+     * redirect it's wheel event to m_pScrollViewport: */
+    if (   (   qobject_cast<QAbstractScrollArea*>(pWidget)
+            || qobject_cast<QAbstractScrollArea*>(pWidget->parent()))
+        && !pWidget->hasFocus()
+        && !pWidget->parentWidget()->hasFocus())
     {
         /* Check if redirected event was really handled, otherwise give it back: */
@@ -876 +875 @@
 
     /* Call to base-class: */
-    return QMainWindow::eventFilter(pObject, pEvent);
+    return QMainWindow::eventFilter(pWidget, pEvent);
 }
 
@@ -917 +916 @@
 void UIAdvancedSettingsDialog::polishEvent()
 {
+    /* Install event-filters for all the required children.
+     * These children can be added together with pages. */
+    foreach (QWidget *pChild, findChildren<QWidget*>())
+    {
+        if (   qobject_cast<QAbstractButton*>(pChild)
+            || qobject_cast<QAbstractScrollArea*>(pChild)
+            || qobject_cast<QAbstractScrollArea*>(pChild->parent())
+            || qobject_cast<QAbstractSpinBox*>(pChild)
+            || qobject_cast<QAbstractSpinBox*>(pChild->parent())
+            || qobject_cast<QComboBox*>(pChild)
+            || qobject_cast<QSlider*>(pChild)
+            || qobject_cast<QTabWidget*>(pChild)
+            || qobject_cast<QTabWidget*>(pChild->parent()))
+            pChild->installEventFilter(this);
+    }
+
     /* Resize to minimum size: */
     resize(minimumSizeHint());
@@ -1318 +1333 @@
 void UIAdvancedSettingsDialog::prepare()
 {
-    /* Prepare 'sticky scrolling timer': */
-    m_pScrollingTimer = new QTimer(this);
-    if (m_pScrollingTimer)
-    {
-        m_pScrollingTimer->setInterval(500);
-        m_pScrollingTimer->setSingleShot(true);
-    }
-
     /* Prepare central-widget: */
     setCentralWidget(new QWidget);

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

@@ -44 +44 @@
 class QShowEvent;
 class QStackedWidget;
-class QTimer;
 class QIDialogButtonBox;
 class UIFilterEditor;
@@ -275 +274 @@
     QMap<int, QString>  m_pageHelpKeywords;
 
-    /** Holds the 'sticky scrolling timer' instance. */
-    QTimer *m_pScrollingTimer;
-
     /** @name Widgets
      * @{ */