Android: Set EnterKeyNext as default type for TextInput

Behavior of EnterKey for virtual keyboard need to be changed for
TextInput. Before this commit, ImeOption was set to IME_ACTION_DONE.
Beacuse of that, setting any text in TextInput automatically accept
QDialogs. That was annoying, when more than one QLineEdit need to be
set.

[ChangeLog][Quick][Android] EnterKey type is now changed from
EnterKeyDefault to EnterKeyNext for virtual keyboard in TextInput. It is
done only if the focus can be moved to QQuickItem below, so the
activeFocusOnTab need to be set.

Fixes: QTBUG-61652
Change-Id: Ib2faf78f4c85788498476c1e67e67d29d508cfea
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 23 insertions, 0 deletions

diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index f944cfe7d7..f798fcd6a8 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1972,6 +1972,29 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
 #if QT_CONFIG(im)
 QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
 {
+#ifdef Q_OS_ANDROID
+    // QTBUG-61652
+    if (property == Qt::ImEnterKeyType) {
+        Q_D(const QQuickItem);
+        // Do not change if type was set manually
+        if (!d->extra.isAllocated()
+          || d->extra->enterKeyAttached == nullptr
+          || d->extra->enterKeyAttached->type() == Qt::EnterKeyDefault) {
+
+            QQuickItem *next = const_cast<QQuickTextInput*>(this)->nextItemInFocusChain();
+            while (next && next != this && !next->activeFocusOnTab())
+                next = next->nextItemInFocusChain();
+            if (next) {
+                const auto nextYPos = next->mapToGlobal(QPoint(0, 0)).y();
+                const auto currentYPos = this->mapToGlobal(QPoint(0, 0)).y();
+                if (currentYPos < nextYPos)
+                    // Set EnterKey to KeyNext type only if the next item
+                    // in the focus chain is below current QQuickTextInput
+                    return Qt::EnterKeyNext;
+            }
+        }
+    }
+#endif
     return inputMethodQuery(property, QVariant());
 }