diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-04-12 16:01:29 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-04 14:46:25 +0000 |
commit | 80fa5f6e76acf3e2850cac51f91dbfbd96092b72 (patch) | |
tree | 7c06582a05189a42cb7b284e9abb78fd438c9ae7 /src/android | |
parent | 9dd4381b693420a956b1f3b5aa9daff7dd0e45c9 (diff) |
Android: populate TouchPoint rotation and axes correctly
We model each TouchPoint contact patch as an ellipse now, which is
consistent with Android APIs.
Change-Id: I4edfbebfb5e1ab6686dba0ec924bfcfbbd6ff0f4
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index af4f20679c..a4341a5a48 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -411,7 +411,9 @@ public class QtNative i == 0, (int)event.getX(i), (int)event.getY(i), - event.getSize(i), + event.getTouchMajor(i), + event.getTouchMinor(i), + event.getOrientation(i), event.getPressure(i)); } @@ -779,7 +781,7 @@ public class QtNative public static native void mouseUp(int winId, int x, int y); public static native void mouseMove(int winId, int x, int y); public static native void touchBegin(int winId); - public static native void touchAdd(int winId, int pointerId, int action, boolean primary, int x, int y, float size, float pressure); + public static native void touchAdd(int winId, int pointerId, int action, boolean primary, int x, int y, float major, float minor, float rotation, float pressure); public static native void touchEnd(int winId, int action); public static native void longPress(int winId, int x, int y); // pointer methods |