2 files changed, 21 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 1f8e7a7..e0881d5 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -721,3 +721,13 @@ void QtChatWindow::handleTextInputReceivedFocus() {
     input_->setFocus();
-    onAllMessagesRead();
+    if (focusTimer_) {
+        focusTimer_->stop();
+    }
+    else {
+        focusTimer_ = std::make_unique<QTimer>(this);
+        focusTimer_->setSingleShot(true);
+        focusTimer_->setTimerType(Qt::CoarseTimer);
+        connect(focusTimer_.get(), &QTimer::timeout, this, &QtChatWindow::handleFocusTimerTick);
+    }
+    focusTimer_->setInterval(1000);
+    focusTimer_->start();
 }
@@ -1031,2 +1041,9 @@ void QtChatWindow::removeChatSecurityMarking() {
 
+void QtChatWindow::handleFocusTimerTick() {
+    if (hasFocus()) {
+        onAllMessagesRead();
+    }
+    focusTimer_.reset();
+}
+
 }
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 4e10053..1269165 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -36,2 +36,3 @@ class QSplitter;
 class QPushButton;
+class QTimer;
 
@@ -198,2 +199,3 @@ namespace Swift {
             void removeChatSecurityMarking();
+            void handleFocusTimerTick();
 
@@ -248,2 +250,3 @@ namespace Swift {
             QLabel* securityMarkingDisplay_ = nullptr;
+            std::unique_ptr<QTimer> focusTimer_;
     };