1 files changed, 41 insertions, 17 deletions

diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm
index c46ed4c0b1..33e5b955e3 100644
--- a/src/plugins/platforms/ios/quiview.mm
+++ b/src/plugins/platforms/ios/quiview.mm
@@ -191,33 +191,57 @@
 
 - (BOOL)becomeFirstResponder
 {
-    if ([super becomeFirstResponder]) {
+    FirstResponderCandidate firstResponderCandidate(self);
+
+    qImDebug() << "win:" << m_qioswindow->window() << "self:" << self
+        << "first:" << [UIResponder currentFirstResponder];
+
+    if (![super becomeFirstResponder]) {
+        qImDebug() << m_qioswindow->window()
+            << "was not allowed to become first responder";
+        return NO;
+    }
+
+    qImDebug() << m_qioswindow->window() << "became first responder";
+
+    if (qGuiApp->focusWindow() != m_qioswindow->window()) {
         QWindowSystemInterface::handleWindowActivated(m_qioswindow->window());
         QWindowSystemInterface::flushWindowSystemEvents();
-
-        return YES;
+    } else {
+        qImDebug() << m_qioswindow->window()
+            << "already active, not sending window activation";
     }
 
-    return NO;
+    return YES;
+}
+
+- (BOOL)responderShouldTriggerWindowDeactivation:(UIResponder *)responder
+{
+    // We don't want to send window deactivation in case the resign
+    // was a result of another Qt window becoming first responder.
+    if ([responder isKindOfClass:[QUIView class]])
+        return NO;
+
+    return YES;
 }
 
 - (BOOL)resignFirstResponder
 {
-    if ([super resignFirstResponder]) {
-        // We don't want to send window deactivation in case we're in the process
-        // of activating another window. The handleWindowActivated of the activation
-        // will take care of both.
-        dispatch_async(dispatch_get_main_queue (), ^{
-            if (![[UIResponder currentFirstResponder] isKindOfClass:[QUIView class]]) {
-                QWindowSystemInterface::handleWindowActivated(0);
-                QWindowSystemInterface::flushWindowSystemEvents();
-            }
-        });
-
-        return YES;
+    qImDebug() << "win:" << m_qioswindow->window() << "self:" << self
+        << "first:" << [UIResponder currentFirstResponder];
+
+    if (![super resignFirstResponder])
+        return NO;
+
+    qImDebug() << m_qioswindow->window() << "resigned first responder";
+
+    UIResponder *newResponder = FirstResponderCandidate::currentCandidate();
+    if ([self responderShouldTriggerWindowDeactivation:newResponder]) {
+        QWindowSystemInterface::handleWindowActivated(0);
+        QWindowSystemInterface::flushWindowSystemEvents();
     }
 
-    return NO;
+    return YES;
 }
 
 // -------------------------------------------------------------------------