diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-10-22 01:52:01 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-10-24 08:44:17 +0200 |
| commit | b79ba9eade2e1b1a8607046ecbe61eba4f063e21 (patch) | |
| tree | 1cfa814eb7aa0288cd66bafa93b82de66a13f4d1 /src | |
| parent | 3272ef4aaf14b72e0bab4698e4ad40b76a3d23d9 (diff) | |
Cocoa: Fix trackpad scrolling modifiers.
We would reset the keyboard modifier state on
NSEventPhaseEnded, which meant that the state would
be NoModifier as soon as the fingers left the trackpad.
We want the modifier state to stay constant for the
duration of the gesture. Remove the "reset" code and
rely on setting currentWheelModifiers on NSEventPhaseNone
only.
Task-number: QTBUG-40197
Change-Id: I615aa5e1148b2b824f1a585bc042c9dbb3f1f250
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 4cb8fbb451..9b6a3f9ef4 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -1359,10 +1359,6 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) } QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers, ph); - - if (momentumPhase == NSEventPhaseEnded || momentumPhase == NSEventPhaseCancelled || momentumPhase == NSEventPhaseNone) { - currentWheelModifiers = Qt::NoModifier; - } } else #endif { |