diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-08 16:22:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-23 11:35:30 +0200 |
commit | dfb4af1fd34a163495790a7896acafa56b86a8f1 (patch) | |
tree | 81d6d9a5b941aaa2f69d2fb0c178abcaf51d222f /src/gui/kernel/qevent.cpp | |
parent | e8ef241d0f35704433ba331dee9578190a5c98a6 (diff) |
Fix spin box with fine grained wheel events
Only step the value in the spin box when we have accumulated one wheel
tick worth of wheel delta.
Also fixes the obsolete contructors of QWheelEvent so they set the non
obsolete properties.
Change-Id: Ic6ea4b37afa8eec85a6ca7bdc0d919bf8fb02608
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
-rw-r--r-- | src/gui/kernel/qevent.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 958df48f17..57c9da2dda 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -642,6 +642,10 @@ QWheelEvent::QWheelEvent(const QPointF &pos, int delta, : QInputEvent(Wheel, modifiers), p(pos), qt4D(delta), qt4O(orient), mouseState(buttons) { g = QCursor::pos(); + if (orient == Qt::Vertical) + angleD = QPoint(0, delta); + else + angleD = QPoint(delta, 0); } /*! @@ -670,7 +674,12 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient) : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), qt4D(delta), qt4O(orient), mouseState(buttons) -{} +{ + if (orient == Qt::Vertical) + angleD = QPoint(0, delta); + else + angleD = QPoint(delta, 0); +} /*! Constructs a wheel event object. |