summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-12 03:05:02 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-12 03:05:02 +0100
commitb8f609f5d17051ed7396eb9f6c874a9cbb73b6b5 (patch)
treeadf3be89674752abe23a59752f5aab533c55eb78 /src
parentd66b0218233f2a97eb864aa1bd8bae325b6535e1 (diff)
parent2493c8b6600f2617848007ee9592c71361b432fe (diff)
downloadqtwayland-b8f609f5d17051ed7396eb9f6c874a9cbb73b6b5.tar.gz
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I24b2eade3e8946a654ef6cf3d02ea95255aa1c00
Diffstat (limited to 'src')
-rw-r--r--src/client/qwaylandinputdevice.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index a9da452d..a4098edd 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -1381,7 +1381,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
tp.area.moveCenter(globalPosition);
}
- tp.state = state;
+ // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
+ if (tp.state != Qt::TouchPointPressed)
+ tp.state = state;
+
tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
}