From 7ddcab3902a6b39c3ed8328c245f58a495b4c43f Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sat, 13 Feb 2021 01:41:09 +0100
Subject: [PATCH] Mark messages as read, when Nheko gets focused
fixes #235
---
resources/qml/MessageView.qml | 15 ++++++++++++++-
src/timeline/TimelineModel.cpp | 6 +++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 13b4c82c6..35b5cac4f 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -77,6 +77,19 @@ ListView {
}
}
+ Connections {
+ target: TimelineManager
+ onFocusChanged: readTimer.running = TimelineManager.isWindowFocused
+ }
+
+ Timer {
+ id: readTimer
+
+ // force current read index to update
+ onTriggered: chat.model.setCurrentIndex(chat.model.currentIndex)
+ interval: 1000
+ }
+
Component {
id: sectionHeader
@@ -193,7 +206,7 @@ ListView {
Connections {
target: chat
onMovementEnded: {
- if (y + height + 2 * chat.spacing > chat.contentY + timelineRoot.height && y < chat.contentY + timelineRoot.height)
+ if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height)
chat.model.currentIndex = index;
}
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 0f35a290b..5c904932a 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -735,14 +735,14 @@ TimelineModel::updateLastMessage()
void
TimelineModel::setCurrentIndex(int index)
{
- if (!ChatPage::instance()->isActiveWindow())
- return;
-
auto oldIndex = idToIndex(currentId);
currentId = indexToId(index);
if (index != oldIndex)
emit currentIndexChanged(index);
+ if (!ChatPage::instance()->isActiveWindow())
+ return;
+
if (!currentId.startsWith("m")) {
auto oldReadIndex =
cache::getEventIndex(roomId().toStdString(), currentReadId.toStdString());
--
GitLab