diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
| commit | f6b1582d726f97d8be4b30f0f6da2350220f27c5 (patch) | |
| tree | 64bcea1b8b3cc8f94073a9e83b36b2b40ad990e8 /src/gui/widgets/qabstractslider.cpp | |
| parent | 110c58a20f3158143d83ebea4f2ece4f7925f913 (diff) | |
| parent | 7bd7f5ec6eb520b7d9940a24817b17132d9ed6a2 (diff) | |
| download | Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.zip Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.gz Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qabstractslider.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractslider.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index 19a8b63..588a48e 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -715,8 +715,7 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e) #else stepsToScroll = int(d->offset_accumulated) * QApplication::wheelScrollLines() * d->singleStep; #endif - if (qAbs(stepsToScroll) > d->pageStep) - stepsToScroll = currentOffset > 0 ? d->pageStep : -d->pageStep; + stepsToScroll = qBound(-d->pageStep, stepsToScroll, d->pageStep); } if (d->invertedControls) |