diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-04-13 13:09:42 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-05-12 13:41:49 +0000 |
| commit | 4170fdfa597e3a5c48d4a78b3bcc1bc780b7d598 (patch) | |
| tree | 65e549b8605ec0f6d6c25bb37fc9c104b864eb6f /src/plugins/platforms/android | |
| parent | d8c843f05f55034edbda38bd84858f4713399fde (diff) | |
Android JNI: update usage of QWindowSystemInterface::handleMouseEvent()
Follup to a37785ec7638e7485112b87dd7e767881fecc114: this API
has been deprecated since 5.11.
Pick-to: 5.15
Change-Id: Ib143f3997f89fc71d37d740338dae7df52ff45b4
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index 13ac40d797..97370236b1 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -141,10 +141,9 @@ namespace QtAndroidInput QWindow *tlw = topLevelWindowAt(globalPos); m_mouseGrabber = tlw; QPoint localPos = tlw ? (globalPos - tlw->position()) : globalPos; - QWindowSystemInterface::handleMouseEvent(tlw, - localPos, - globalPos, - Qt::MouseButtons(Qt::LeftButton)); + QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos, + Qt::MouseButtons(Qt::LeftButton), + Qt::LeftButton, QEvent::MouseButtonPress); } static void mouseUp(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y) @@ -154,8 +153,9 @@ namespace QtAndroidInput if (!tlw) tlw = topLevelWindowAt(globalPos); QPoint localPos = tlw ? (globalPos -tlw->position()) : globalPos; - QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos - , Qt::MouseButtons(Qt::NoButton)); + QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos, + Qt::MouseButtons(Qt::NoButton), + Qt::LeftButton, QEvent::MouseButtonRelease); m_ignoreMouseEvents = false; m_mouseGrabber = 0; } @@ -171,10 +171,9 @@ namespace QtAndroidInput if (!tlw) tlw = topLevelWindowAt(globalPos); QPoint localPos = tlw ? (globalPos-tlw->position()) : globalPos; - QWindowSystemInterface::handleMouseEvent(tlw, - localPos, - globalPos, - Qt::MouseButtons(m_mouseGrabber ? Qt::LeftButton : Qt::NoButton)); + QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos, + Qt::MouseButtons(m_mouseGrabber ? Qt::LeftButton : Qt::NoButton), + Qt::NoButton, QEvent::MouseMove); } static void mouseWheel(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y, jfloat hdelta, jfloat vdelta) @@ -212,16 +211,14 @@ namespace QtAndroidInput QPoint localPos = tlw ? (globalPos-tlw->position()) : globalPos; // Release left button - QWindowSystemInterface::handleMouseEvent(tlw, - localPos, - globalPos, - Qt::MouseButtons(Qt::NoButton)); + QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos, + Qt::MouseButtons(Qt::NoButton), Qt::LeftButton, + QEvent::MouseButtonRelease); // Press right button - QWindowSystemInterface::handleMouseEvent(tlw, - localPos, - globalPos, - Qt::MouseButtons(Qt::RightButton)); + QWindowSystemInterface::handleMouseEvent(tlw, localPos, globalPos, + Qt::MouseButtons(Qt::RightButton), Qt::RightButton, + QEvent::MouseButtonPress); } static void touchBegin(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/) |