diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-03 10:30:20 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-03 10:41:10 (GMT) |
| commit | d53315d30b38352db11063096ee3867a40bdc234 (patch) | |
| tree | 6ccfe9142099d627b2b7acd5458477a2cecb1477 /src/gui/widgets/qabstractslider.cpp | |
| parent | 7d4ef9167249df5f00831dc07e57705eb1ddd22a (diff) | |
| download | Qt-d53315d30b38352db11063096ee3867a40bdc234.zip Qt-d53315d30b38352db11063096ee3867a40bdc234.tar.gz Qt-d53315d30b38352db11063096ee3867a40bdc234.tar.bz2 | |
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d.
This shown to cause more problem than it solved
Also update the changelog
Reviewed-by: Thierry
Diffstat (limited to 'src/gui/widgets/qabstractslider.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractslider.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index 2874647..77c5a01 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -697,6 +697,8 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e) { Q_D(QAbstractSlider); e->ignore(); + if (e->orientation() != d->orientation && !rect().contains(e->pos())) + return; int stepsToScroll = 0; qreal offset = qreal(e->delta()) / 120; |