From b1820295e1e8f04634cf9c008a2473d9e2889288 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Fri, 15 Oct 2021 05:52:44 +0000 Subject: Revert "Android: Place cursor correctly on screen when editing" This reverts commit 5c6b10c3cee5737dbc041d0463220898c8120807. It caused a regression such that the main window no longer resized or panned when the VKB is shown, in spite of android:windowSoftInputMode being set. Pick-to: 6.2 5.15 Task-number: QTBUG-95300 Task-number: QTBUG-96117 Task-number: QTBUG-97503 Change-Id: If56e1113eea69a940f6760bdb2ad06a93a0759c1 Reviewed-by: Andreas Buhr Reviewed-by: Assam Boudjelthia --- src/plugins/platforms/android/androidjniinput.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/plugins/platforms/android/androidjniinput.cpp') diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index ebdc18cc07..eb41ec6656 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -78,16 +78,15 @@ namespace QtAndroidInput candidatesEnd); } - void showSoftwareKeyboard(int left, int top, int width, int height, int editorHeight, int inputHints, int enterKeyType) + void showSoftwareKeyboard(int left, int top, int width, int height, int inputHints, int enterKeyType) { QJniObject::callStaticMethod(applicationClass(), "showSoftwareKeyboard", - "(IIIIIII)V", + "(IIIIII)V", left, top, width, height, - editorHeight, inputHints, enterKeyType); #ifdef QT_DEBUG_ANDROID_IM_PROTOCOL @@ -134,17 +133,6 @@ namespace QtAndroidInput anchor.x(), anchor.y(), rtl); } - void updateInputItemRectangle(int left, int top, int width, int height) - { - QJniObject::callStaticMethod(applicationClass(), - "updateInputItemRectangle", - "(IIII)V", - left, - top, - width, - height); - } - static void mouseDown(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y) { if (m_ignoreMouseEvents) -- cgit v1.2.1