1 files changed, 29 insertions, 13 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm
index e30ccc2c84..5716ad041e 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.mm
+++ b/src/plugins/platforms/ios/qiosinputcontext.mm
@@ -18,6 +18,8 @@
 #include <QGuiApplication>
 #include <QtGui/private/qwindow_p.h>
 
+#include <QtCore/qpointer.h>
+
 // -------------------------------------------------------------------------
 
 static QUIView *focusView()
@@ -119,12 +121,12 @@ static QUIView *focusView()
 {
     [self keyboardWillOrDidChange:notification];
 
-    UIResponder *firstResponder = [UIResponder currentFirstResponder];
+    UIResponder *firstResponder = [UIResponder qt_currentFirstResponder];
     if (![firstResponder isKindOfClass:[QIOSTextInputResponder class]])
         return;
 
     // Enable hide-keyboard gesture
-    self.enabled = YES;
+    self.enabled = m_context->isInputPanelVisible();
 
     m_context->scrollToCursor();
 }
@@ -174,7 +176,11 @@ static QUIView *focusView()
 {
     [super touchesBegan:touches withEvent:event];
 
-    Q_ASSERT(m_context->isInputPanelVisible());
+    if (!m_context->isInputPanelVisible()) {
+        qImDebug("keyboard was hidden by sliding it down, disabling hide-keyboard gesture");
+        self.enabled = NO;
+        return;
+    }
 
     if ([touches count] != 1)
         self.state = UIGestureRecognizerStateFailed;
@@ -228,7 +234,7 @@ static QUIView *focusView()
 
     if (self.state == UIGestureRecognizerStateBegan) {
         qImDebug("hide keyboard gesture was triggered");
-        UIResponder *firstResponder = [UIResponder currentFirstResponder];
+        UIResponder *firstResponder = [UIResponder qt_currentFirstResponder];
         Q_ASSERT([firstResponder isKindOfClass:[QIOSTextInputResponder class]]);
         [firstResponder resignFirstResponder];
     }
@@ -297,11 +303,7 @@ QIOSInputContext::QIOSInputContext()
     , m_keyboardHideGesture([[QIOSKeyboardListener alloc] initWithQIOSInputContext:this])
     , m_textResponder(0)
 {
-    if (isQtApplication()) {
-        QIOSScreen *iosScreen = static_cast<QIOSScreen*>(QGuiApplication::primaryScreen()->handle());
-        [iosScreen->uiWindow() addGestureRecognizer:m_keyboardHideGesture];
-    }
-
+    Q_ASSERT(!qGuiApp->focusWindow());
     connect(qGuiApp, &QGuiApplication::focusWindowChanged, this, &QIOSInputContext::focusWindowChanged);
 }
 
@@ -346,7 +348,7 @@ void QIOSInputContext::clearCurrentFocusObject()
 
 void QIOSInputContext::updateKeyboardState(NSNotification *notification)
 {
-#ifdef Q_OS_TVOS
+#if defined(Q_OS_TVOS) || defined(Q_OS_VISIONOS)
     Q_UNUSED(notification);
 #else
     static CGRect currentKeyboardRect = CGRectZero;
@@ -366,7 +368,7 @@ void QIOSInputContext::updateKeyboardState(NSNotification *notification)
         // The isInputPanelVisible() property is based on whether or not the virtual keyboard
         // is visible on screen, and does not follow the logic of the iOS WillShow and WillHide
         // notifications which are not emitted for undocked keyboards, and are buggy when dealing
-        // with input-accesosory-views. The reason for using frameEnd here (the future state),
+        // with input-accessory-views. The reason for using frameEnd here (the future state),
         // instead of the current state reflected in frameBegin, is that QInputMethod::isVisible()
         // is documented to reflect the future state in the case of animated transitions.
         m_keyboardState.keyboardVisible = CGRectIntersectsRect(frameEnd, [UIScreen mainScreen].bounds);
@@ -436,6 +438,7 @@ UIView *QIOSInputContext::scrollableRootView()
 
 void QIOSInputContext::scrollToCursor()
 {
+#if !defined(Q_OS_VISIONOS)
     if (!isQtApplication())
         return;
 
@@ -492,6 +495,7 @@ void QIOSInputContext::scrollToCursor()
     } else {
         scroll(0);
     }
+#endif
 }
 
 void QIOSInputContext::scroll(int y)
@@ -603,12 +607,15 @@ void QIOSInputContext::setFocusObject(QObject *focusObject)
 
 void QIOSInputContext::focusWindowChanged(QWindow *focusWindow)
 {
-    Q_UNUSED(focusWindow);
-
     qImDebug() << "new focus window =" << focusWindow;
 
     reset();
 
+    if (isQtApplication()) {
+        [m_keyboardHideGesture.view removeGestureRecognizer:m_keyboardHideGesture];
+        [focusView().window addGestureRecognizer:m_keyboardHideGesture];
+    }
+
     // The keyboard rectangle depend on the focus window, so
     // we need to re-evaluate the keyboard state.
     updateKeyboardState();
@@ -712,11 +719,20 @@ void QIOSInputContext::reset()
     // Instead, we choose to recreate the text responder as a brute-force solution
     // until we have better knowledge of what is going on (or implement the new
     // UITextInteraction protocol).
+    const auto oldResponder = m_textResponder;
     [m_textResponder reset];
     [m_textResponder autorelease];
     m_textResponder = nullptr;
 
     update(Qt::ImQueryAll);
+
+    // If update() didn't end up creating a new text responder, oldResponder will still be
+    // the first responder. In that case we need to resign it, so that the input panel hides.
+    // (the input panel will apparently not hide if the first responder is only released).
+    if ([oldResponder isFirstResponder]) {
+        qImDebug("IM not enabled, resigning autoreleased text responder as first responder");
+        [oldResponder resignFirstResponder];
+    }
 }
 
 /*!