diff options
| author | Rami Potinkara <rami.potinkara@qt.io> | 2021-10-15 05:52:44 +0000 |
|---|---|---|
| committer | Rami Potinkara <rami.potinkara@qt.io> | 2021-10-26 20:46:24 +0000 |
| commit | b1820295e1e8f04634cf9c008a2473d9e2889288 (patch) | |
| tree | 1fd60951862a7479a73f225eb5a92a79c9c24b84 /src/plugins/platforms/android/androidjniinput.h | |
| parent | 323b97ccaea7b9442fa1bcb01514e0c5a4a97fdc (diff) | |
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 <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/androidjniinput.h')
| -rw-r--r-- | src/plugins/platforms/android/androidjniinput.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.h b/src/plugins/platforms/android/androidjniinput.h index ceef2a826c..30c083f51c 100644 --- a/src/plugins/platforms/android/androidjniinput.h +++ b/src/plugins/platforms/android/androidjniinput.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace QtAndroidInput { // Software keyboard support - void showSoftwareKeyboard(int top, int left, int width, int editorHeight, int height, int inputHints, int enterKeyType); + void showSoftwareKeyboard(int top, int left, int width, int height, int inputHints, int enterKeyType); void resetSoftwareKeyboard(); void hideSoftwareKeyboard(); bool isSoftwareKeyboardVisible(); @@ -57,8 +57,6 @@ namespace QtAndroidInput void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd); // Software keyboard support - // edit field resize - void updateInputItemRectangle(int left, int top, int width, int height); // cursor/selection handles void updateHandles(int handleCount, QPoint editMenuPos = QPoint(), uint32_t editButtons = 0, QPoint cursor = QPoint(), QPoint anchor = QPoint(), bool rtl = false); |