diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-08 10:02:02 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-08 12:04:06 (GMT) |
| commit | febca287b4b357240246f7149075ee3917f6c20c (patch) | |
| tree | bf812af49462e39c25fd006765f6e64e9c9aefcf | |
| parent | 7cc07c14cedcec0b4b2929b6e4243fff80531670 (diff) | |
| download | Qt-febca287b4b357240246f7149075ee3917f6c20c.zip Qt-febca287b4b357240246f7149075ee3917f6c20c.tar.gz Qt-febca287b4b357240246f7149075ee3917f6c20c.tar.bz2 | |
Fixes qabstractslider autotest
Fixed a bad merge in the QAbstractSlider::wheelEvent.
Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.
Reviewed-by: Richard Moe Gustavsen
| -rw-r--r-- | src/gui/widgets/qabstractslider.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qabstractslider/tst_qabstractslider.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index f0ae5a8..73c17db 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -739,8 +739,6 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e) { Q_D(QAbstractSlider); e->ignore(); - if (e->orientation() != d->orientation && !rect().contains(e->pos())) - return; int delta = e->delta(); if (d->scrollByDelta(e->orientation(), e->modifiers(), delta)) e->accept(); diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index 40281c6..293af36 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -768,7 +768,7 @@ void tst_QAbstractSlider::wheelEvent_data() << true // inverted controls << 20 // wheel scroll lines << false // with modifiers - << 1 // delta + << -1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 30 // expected position after @@ -782,7 +782,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 1 // wheel scroll lines << false // with modifiers - << 2 // delta + << -2 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 100 // expected position after @@ -796,7 +796,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 1 // wheel scroll lines << false // with modifiers - << -2 // delta + << 2 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 0 // expected position after @@ -810,7 +810,7 @@ void tst_QAbstractSlider::wheelEvent_data() << false // inverted controls << 20 // wheel scroll lines << true // with modifiers - << 1 // delta + << -1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Horizontal) // orientation of wheel << 90 // expected position after |