summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorQt CI Bot <qt_ci_bot@qt-project.org>2021-03-30 14:36:19 +0000
committerQt CI Bot <qt_ci_bot@qt-project.org>2021-03-30 14:36:19 +0000
commit5ce367a55224c862c11aaf5945ddf7bd3c934600 (patch)
tree42127b651f6318624d4eb21bb7596493757f1e12 /src/android
parent31c81e08c6b0fa878ab7a22771230635ac2e85c6 (diff)
parent06b0b2be160e6122d1a80e7c37916512429cd145 (diff)
Merge integration refs/builds/qtci/dev/1617105725
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtSurface.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
index 1d89aeebef..bd52f34abd 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
@@ -101,6 +101,11 @@ public class QtSurface extends SurfaceView implements SurfaceHolder.Callback
@Override
public boolean onTouchEvent(MotionEvent event)
{
+ // QTBUG-65927
+ // Fix event positions depending on Surface position.
+ // In case when Surface is moved, we should also add this move to event position
+ event.setLocation(event.getX() + getX(), event.getY() + getY());
+
QtNative.sendTouchEvent(event, getId());
m_gestureDetector.onTouchEvent(event);
return true;