aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/quicktemplates2/qquickcombobox.cpp2
-rw-r--r--src/quicktemplates2/qquickspinbox.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index 3639bf2f..d992c649 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -1639,12 +1639,10 @@ void QQuickComboBox::wheelEvent(QWheelEvent *event)
Q_D(QQuickComboBox);
QQuickControl::wheelEvent(event);
if (d->wheelEnabled && !d->isPopupVisible()) {
- const int oldIndex = d->currentIndex;
if (event->angleDelta().y() > 0)
d->decrementCurrentIndex();
else
d->incrementCurrentIndex();
- event->setAccepted(d->currentIndex != oldIndex);
}
}
#endif
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 04bdec43..7412936c 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -955,8 +955,7 @@ void QQuickSpinBox::wheelEvent(QWheelEvent *event)
if (d->wheelEnabled) {
const QPointF angle = event->angleDelta();
const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep;
- if (!d->stepBy(qRound(d->effectiveStepSize() * delta), true))
- event->ignore();
+ d->stepBy(qRound(d->effectiveStepSize() * delta), true);
}
}
#endif