diff options
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 7 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index a714a56338..b36222502d 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -196,6 +196,20 @@ namespace QtAndroidInput angleDelta); } + void releaseMouse(int x, int y) + { + m_ignoreMouseEvents = true; + QPoint globalPos(x,y); + QWindow *tlw = topLevelWindowAt(globalPos); + QPoint localPos = tlw ? (globalPos-tlw->position()) : globalPos; + + // Release left button + QWindowSystemInterface::handleMouseEvent(tlw, + localPos, + globalPos, + Qt::MouseButtons(Qt::NoButton)); + } + static void longPress(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y) { QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext(); diff --git a/src/plugins/platforms/android/androidjniinput.h b/src/plugins/platforms/android/androidjniinput.h index cc3070c4aa..2e2470ae8f 100644 --- a/src/plugins/platforms/android/androidjniinput.h +++ b/src/plugins/platforms/android/androidjniinput.h @@ -61,6 +61,8 @@ namespace QtAndroidInput void updateHandles(int handleCount, QPoint editMenuPos = QPoint(), uint32_t editButtons = 0, QPoint cursor = QPoint(), QPoint anchor = QPoint(), bool rtl = false); bool registerNatives(JNIEnv *env); + + void releaseMouse(int x, int y); } QT_END_NAMESPACE diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index d90e0ac1ba..250bcae58a 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -715,7 +715,14 @@ void QAndroidInputContext::touchDown(int x, int y) void QAndroidInputContext::longPress(int x, int y) { + static bool noHandles = qEnvironmentVariableIntValue("QT_QPA_NO_TEXT_HANDLES"); + if (noHandles) + return; + if (m_focusObject && inputItemRectangle().contains(x, y)) { + // Release left button, otherwise the following events will cancel the menu popup + QtAndroidInput::releaseMouse(x, y); + handleLocationChanged(1, x, y); ScopedValueChangeBack<bool> svcb(m_blockUpdateSelection, true); |