diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-02-09 14:39:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 11:41:04 +0100 |
| commit | 09e2e77be25e02ff1c3ba432d739fbc5fe860ec7 (patch) | |
| tree | 369e230e9b7ad53e699b151d00f1a8b629cded30 /src/widgets/kernel/qwidgetwindow_qpa.cpp | |
| parent | e5830479d62240ed0af580780c0586baca2b66a2 (diff) | |
Handle TouchCancel in gui and widgets
Change-Id: I31739840348d88ae408ac1aae2399f6328ccdd43
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidgetwindow_qpa.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidgetwindow_qpa.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp index e7ba4853a0..c2524567f1 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa.cpp +++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp @@ -110,6 +110,7 @@ bool QWidgetWindow::event(QEvent *event) case QEvent::TouchBegin: case QEvent::TouchUpdate: case QEvent::TouchEnd: + case QEvent::TouchCancel: handleTouchEvent(static_cast<QTouchEvent *>(event)); return true; @@ -289,7 +290,10 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) void QWidgetWindow::handleTouchEvent(QTouchEvent *event) { - QApplicationPrivate::translateRawTouchEvent(m_widget, event->device(), event->touchPoints(), event->timestamp()); + if (event->type() == QEvent::TouchCancel) + QApplicationPrivate::translateTouchCancel(event->device(), event->timestamp()); + else + QApplicationPrivate::translateRawTouchEvent(m_widget, event->device(), event->touchPoints(), event->timestamp()); } void QWidgetWindow::handleKeyEvent(QKeyEvent *event) |