1 files changed, 30 insertions, 7 deletions

diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index 1a9f71eabd..4d04db7edd 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -514,7 +514,12 @@ QAndroidInputContext::QAndroidInputContext()
         auto im = qGuiApp->inputMethod();
         if (!im->inputItemClipRectangle().contains(im->anchorRectangle()) ||
                 !im->inputItemClipRectangle().contains(im->cursorRectangle())) {
-            m_handleMode = Hidden;
+            // Undoes the hidden request if the only reason for the hidden is that
+            // X of the cursorRectangle or X of the  anchorRectangle is less than 0.
+            const int rectX = im->inputItemClipRectangle().x();
+            if (im->cursorRectangle().x() > rectX && im->anchorRectangle().x() > rectX)
+                m_handleMode = Hidden;
+
             updateSelectionHandles();
         }
     });
@@ -623,13 +628,13 @@ void QAndroidInputContext::updateSelectionHandles()
     if (noHandles)
         return;
 
+    QWindow *window = qGuiApp->focusWindow();
     auto im = qGuiApp->inputMethod();
-    if (!m_focusObject || ((m_handleMode & 0xff) == Hidden)) {
+    if (!m_focusObject || ((m_handleMode & 0xff) == Hidden) || !window) {
         // Hide the handles
         QtAndroidInput::updateHandles(Hidden);
         return;
     }
-    QWindow *window = qGuiApp->focusWindow();
     double pixelDensity = window
         ? QHighDpiScaling::factor(window)
         : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
@@ -678,12 +683,30 @@ void QAndroidInputContext::updateSelectionHandles()
     if (cpos > anchor)
         std::swap(leftRect, rightRect);
 
+    // Move the left or right select handle to the center from the screen edge
+    // the select handle is close to or over the screen edge. Otherwise, the
+    // select handle might go out of the screen and it would be impossible to drag.
     QPoint leftPoint(window->mapToGlobal(leftRect.bottomLeft().toPoint()));
-    QPoint righPoint(window->mapToGlobal(rightRect.bottomRight().toPoint()));
-    QPoint editPoint(window->mapToGlobal(leftRect.united(rightRect)
-                                                         .topLeft().toPoint()));
+    QPoint rightPoint(window->mapToGlobal(rightRect.bottomRight().toPoint()));
+    static int m_selectHandleWidth = 0;
+    // For comparison, get the width of the handle.
+    // Only half of the width will protrude from the cursor on each side
+    if (m_selectHandleWidth == 0)
+        m_selectHandleWidth = QtAndroidInput::getSelectHandleWidth() / 2;
+
+    int rightSideOfScreen = QtAndroid::androidPlatformIntegration()->screen()->availableGeometry().right();
+
+    // Check if handle will fit the screen on left side. If not, then move it closer to the center
+    if (leftPoint.x() <= m_selectHandleWidth)
+        leftPoint.setX(m_selectHandleWidth / pixelDensity);
+
+    // Check if handle will fit the screen on right side. If not, then move it closer to the center
+    if (rightPoint.x() >= (rightSideOfScreen / pixelDensity) - m_selectHandleWidth)
+        rightPoint.setX((rightSideOfScreen / pixelDensity) - (m_selectHandleWidth / pixelDensity));
+
+    QPoint editPoint(window->mapToGlobal(leftRect.united(rightRect).topLeft().toPoint()));
     QtAndroidInput::updateHandles(m_handleMode, editPoint * pixelDensity, EditContext::AllButtons,
-                                  leftPoint * pixelDensity, righPoint * pixelDensity,
+                                  leftPoint * pixelDensity, rightPoint * pixelDensity,
                                   query.value(Qt::ImCurrentSelection).toString().isRightToLeft());
     m_hideCursorHandleTimer.stop();
 }