Ensure chat continues to follow new messages even after pool overflow

Aldrog · Oct 29, 2016 · d7593ae · d7593ae
1 parent 5af8de9
commit d7593ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/sailfish-ui/pages/StreamPage.qml b/sailfish-ui/pages/StreamPage.qml
@@ -347,13 +347,21 @@ Page {
                 }
             }
 
+            // This makes sure individual messages don't get lost
+            onAtYEndChanged: {
+                if(atEnd && !atYEnd)
+                    currentIndex = chat.count - 1
+            }
+
             model: twitchChat.messages
             delegate: Item {
                 height: lbl.height
                 width: chat.width
 
                 property bool viewed: false
 
+                // This is the main handler for chat autoscroll, though it only works when messages count's increased
+                // above there's additional handler covering this case
                 ListView.onAdd: {
                     if(!viewed && chat.atEnd) {
                         chat.currentIndex = chat.count - 1

diff --git a/src/messagelistmodel.cpp b/src/messagelistmodel.cpp
@@ -43,8 +43,11 @@ QVariant MessageListModel::data(const QModelIndex &index, int role) const {
 }
 
 void MessageListModel::appendMessage(Message &message) {
-    if(rowCount() > MAX_MESSAGE_POOL) {
-        beginRemoveRows(QModelIndex(), 0, 0);
+    // When message pool's overflowed, we remove two messages on every second received message
+    // this way we can be sure that at least every second message addition increases messages count (which makes handling on QML side easier)
+    if(rowCount() > MAX_MESSAGE_POOL && rowCount() % 2 == 0) {
+        beginRemoveRows(QModelIndex(), 0, 1);
+        messageList.removeFirst();
         messageList.removeFirst();
         endRemoveRows();
     }