diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-06-10 15:41:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-06-19 17:22:52 +0200 |
| commit | 54a2206bba699687c4218bde2d9b295c2cf5a549 (patch) | |
| tree | a4d4314ac7a030faa0d9d71704630741f45aa41d /src/plugins/platforms/windows/qwindowsmousehandler.cpp | |
| parent | d88b976858437f081ef9f8150b3697586a5bf73a (diff) | |
Windows: Mark only mouse events synthesized by touch as such.
Pass on mouse events from pen.
Task-number: QTBUG-39353
Change-Id: I96c4e023ddb1c853d5228d00aa9604941556abb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmousehandler.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmousehandler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index cc0597b72d..4633378342 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -178,10 +178,11 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd, // since we do not want to ignore mouse events coming from a tablet. const quint64 extraInfo = GetMessageExtraInfo(); if ((extraInfo & signatureMask) == miWpSignature) { - source = Qt::MouseEventSynthesizedBySystem; - const bool fromTouch = extraInfo & 0x80; // (else: Tablet PC) - if (fromTouch && !passSynthesizedMouseEvents) - return false; + if (extraInfo & 0x80) { // Bit 7 indicates touch event, else tablet pen. + source = Qt::MouseEventSynthesizedBySystem; + if (!passSynthesizedMouseEvents) + return false; + } } #endif // !Q_OS_WINCE |