Improved scrollindicators

CMakeLists.txt

@@ -52,6 +52,7 @@ set(quaternion_SRCS
     client/quaternionroom.cpp
     client/message.cpp
     client/imageprovider.cpp
+    client/activitydetector.cpp
     client/logindialog.cpp
     client/mainwindow.cpp
     client/roomlistdock.cpp

client/activitydetector.cpp

@@ -0,0 +1,67 @@
+/**************************************************************************
+ *                                                                        *
+ * Copyright (C) 2016 Malte Brandy <[email protected]>                        *
+ *                                                                        *
+ * This program is free software; you can redistribute it and/or          *
+ * modify it under the terms of the GNU General Public License            *
+ * as published by the Free Software Foundation; either version 3         *
+ * of the License, or (at your option) any later version.                 *
+ *                                                                        *
+ * This program is distributed in the hope that it will be useful,        *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ * GNU General Public License for more details.                           *
+ *                                                                        *
+ * You should have received a copy of the GNU General Public License      *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ *                                                                        *
+ **************************************************************************/
+
+#include "activitydetector.h"
+#include "mainwindow.h"
+#include "chatroomwidget.h"
+#include "models/messageeventmodel.h"
+#include <QtCore/QDebug>
+
+ActivityDetector::ActivityDetector(QApplication* a, MainWindow* w): m_app(a), m_mainWindow(w), m_enabled(false), m_messageEventModel(w->getChatRoomWidget()->getMessageEventModel())
+{
+    connect(this, &ActivityDetector::triggered, m_messageEventModel, &MessageEventModel::markShownAsRead);
+    connect(m_messageEventModel, &MessageEventModel::lastShownIndexChanged, this, &ActivityDetector::updateEnabled);
+    connect(m_messageEventModel, &MessageEventModel::readMarkerIndexChanged, this, &ActivityDetector::updateEnabled);
+}
+
+void ActivityDetector::updateEnabled()
+{
+    setEnabled(m_messageEventModel->awaitingMarkRead());
+}
+
+void ActivityDetector::setEnabled(bool enabled)
+{
+    if (enabled && !m_enabled) {
+        m_app->installEventFilter(this);
+        m_mainWindow->setMouseTracking(true);
+        m_enabled = true;
+        qDebug() << "enabling ActivityDetector";
+    }
+    if (!enabled && m_enabled) {
+        m_mainWindow->setMouseTracking(false);
+        m_app->removeEventFilter(this);
+        m_enabled = false;
+        qDebug() << "disabling ActivityDetector";
+    }
+}
+
+bool ActivityDetector::eventFilter(QObject* obj, QEvent* ev)
+{
+    switch (ev->type())
+    {
+    case QEvent::KeyPress:
+    case QEvent::FocusIn:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonPress:
+        emit triggered();
+        setEnabled(false);
+    default:;
+    }
+    return QObject::eventFilter(obj, ev);
+}

client/activitydetector.h

@@ -0,0 +1,49 @@
+/**************************************************************************
+ *                                                                        *
+ * Copyright (C) 2016 Malte Brandy <[email protected]>                        *
+ *                                                                        *
+ * This program is free software; you can redistribute it and/or          *
+ * modify it under the terms of the GNU General Public License            *
+ * as published by the Free Software Foundation; either version 3         *
+ * of the License, or (at your option) any later version.                 *
+ *                                                                        *
+ * This program is distributed in the hope that it will be useful,        *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ * GNU General Public License for more details.                           *
+ *                                                                        *
+ * You should have received a copy of the GNU General Public License      *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ *                                                                        *
+ **************************************************************************/
+
+#pragma once
+
+#include <QtWidgets/QApplication>
+
+class MainWindow;
+class MessageEventModel;
+
+class ActivityDetector : public QObject
+{
+    Q_OBJECT
+
+    public:
+        ActivityDetector(QApplication* a, MainWindow* c);
+
+    public slots:
+        void updateEnabled();
+        void setEnabled(bool enabled);
+
+    signals:
+        void triggered();
+
+    protected:
+        bool eventFilter(QObject* obj, QEvent* ev);
+
+    private:
+        QApplication* m_app;
+        MainWindow* m_mainWindow;
+        bool m_enabled;
+        MessageEventModel* m_messageEventModel;
+};

client/chatroomwidget.cpp

@@ -94,7 +94,6 @@ ChatRoomWidget::ChatRoomWidget(QWidget* parent)
     QObject* rootItem = m_quickView->rootObject();
     connect( rootItem, SIGNAL(getPreviousContent()), this, SLOT(getPreviousContent()) );
 
-
     m_chatEdit = new ChatEdit(this);
     connect( m_chatEdit, &QLineEdit::returnPressed, this, &ChatRoomWidget::sendLine );
 
@@ -116,9 +115,9 @@ ChatRoomWidget::~ChatRoomWidget()
 {
 }
 
-void ChatRoomWidget::lookAtRoom()
+MessageEventModel* ChatRoomWidget::getMessageEventModel()
 {
-    m_messageModel->markShownAsRead();
+    return m_messageModel;
 }
 
 void ChatRoomWidget::enableDebug()

client/chatroomwidget.h

@@ -47,7 +47,7 @@ class ChatRoomWidget: public QWidget
         void enableDebug();
         void triggerCompletion();
         void cancelCompletion();
-        void lookAtRoom();
+        MessageEventModel* getMessageEventModel();
 
     signals:
         void joinRoomNeedsInteraction();

client/main.cpp

@@ -23,32 +23,7 @@
 #include <QtCore/QDebug>
 
 #include "mainwindow.h"
-
-class ActivityDetector : public QObject
-{
-    public:
-        ActivityDetector(MainWindow* c): m_mainWindow(c)
-        {
-            c->setMouseTracking(true);
-        };
-    protected:
-        bool eventFilter(QObject* obj, QEvent* ev)
-        {
-            switch (ev->type())
-            {
-            case QEvent::KeyPress:
-            case QEvent::FocusIn:
-            case QEvent::MouseMove:
-            case QEvent::MouseButtonPress:
-                m_mainWindow->activity();
-            default:;
-            }
-            return QObject::eventFilter(obj, ev);
-        }
-    private:
-        MainWindow* m_mainWindow;
-};
-
+#include "activitydetector.h"
 
 int main( int argc, char* argv[] )
 {
@@ -80,8 +55,7 @@ int main( int argc, char* argv[] )
     MainWindow window;
     if( debugEnabled )
         window.enableDebug();
-    ActivityDetector ad(&window);
-    app.installEventFilter(&ad);
+    ActivityDetector ad(&app, &window);
     window.show();
 
     return app.exec();

client/mainwindow.cpp

@@ -67,9 +67,9 @@ MainWindow::~MainWindow()
 {
 }
 
-void MainWindow::activity()
+ChatRoomWidget* MainWindow::getChatRoomWidget()
 {
-    chatRoomWidget->lookAtRoom();
+   return chatRoomWidget;
 }
 
 void MainWindow::createMenu()

client/mainwindow.h

@@ -43,9 +43,9 @@ class MainWindow: public QMainWindow
         virtual ~MainWindow();
 
         void enableDebug();
-        void activity();
 
         void setConnection(QuaternionConnection* newConnection);
+        ChatRoomWidget* getChatRoomWidget();
 
     protected:
         virtual void closeEvent(QCloseEvent* event) override;

client/models/messageeventmodel.cpp

@@ -66,6 +66,7 @@ MessageEventModel::MessageEventModel(QObject* parent)
     : QAbstractListModel(parent)
     , m_currentRoom(nullptr)
     , lastShownIndex(-1)
+    , m_readMarkerIndex(-1)
 { }
 
 MessageEventModel::~MessageEventModel()
@@ -83,25 +84,34 @@ void MessageEventModel::changeRoom(QuaternionRoom* room)
 
     m_currentRoom = room;
     lastShownIndex = -1;
+    m_readMarkerIndex = -1;
     if( room )
     {
         using namespace QMatrixClient;
-        connect(m_currentRoom, &Room::aboutToAddNewMessages,
+        connect(m_currentRoom, &Room::aboutToAddNewMessages, this,
                 [=](const Events& events)
                 {
                     beginInsertRows(QModelIndex(),
                                     rowCount(), rowCount() + events.size() - 1);
                 });
-        connect(m_currentRoom, &Room::aboutToAddHistoricalMessages,
+        connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this,
                 [=](const Events& events)
                 {
                     beginInsertRows(QModelIndex(), 0, events.size() - 1);
                 });
-        connect(m_currentRoom, &Room::addedMessages,
-                this, &MessageEventModel::endInsertRows);
+        connect(m_currentRoom, &Room::addedMessages, this,
+                [=]()
+                {
+                    endInsertRows();
+                    updateReadMarkerIndex();
+                });
+        connect(m_currentRoom, &Room::readMarkerPromoted,
+                this, &MessageEventModel::updateReadMarkerIndex);
         qDebug() << "connected" << room;
     }
     endResetModel();
+    emit lastShownIndexChanged(lastShownIndex);
+    updateReadMarkerIndex();
 }
 
 int MessageEventModel::rowCount(const QModelIndex& parent) const
@@ -329,9 +339,33 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
 
 void MessageEventModel::markShownAsRead()
 {
-    if (m_currentRoom && lastShownIndex > -1)
+    if (m_currentRoom && lastShownIndex > -1 && lastShownIndex < m_currentRoom->messages().count())
     {
         auto lastShownMessage = m_currentRoom->messages().at(lastShownIndex);
         m_currentRoom->markMessagesAsRead(lastShownMessage->messageEvent()->id());
     }
 }
+
+void MessageEventModel::updateReadMarkerIndex()
+{
+    if( !m_currentRoom )
+        return;
+    for (int newReadMarkerIndex = m_readMarkerIndex; newReadMarkerIndex < m_currentRoom->messages().count() ; ++newReadMarkerIndex)
+        {
+        if (newReadMarkerIndex >= 0 && m_currentRoom->readMarkerEventId() == m_currentRoom->messages().at(newReadMarkerIndex)->messageEvent()->id())
+        {
+            if (newReadMarkerIndex != m_readMarkerIndex)
+            {
+                m_readMarkerIndex = newReadMarkerIndex;
+                emit readMarkerIndexChanged(newReadMarkerIndex);
+            }
+            return;
+        }
+    }
+}
+
+bool MessageEventModel::awaitingMarkRead()
+{
+    qDebug() << "readMarker: " << m_readMarkerIndex << "lastShown: " << lastShownIndex;
+    return m_readMarkerIndex < lastShownIndex;
+}

client/models/messageeventmodel.h

@@ -32,6 +32,7 @@ class MessageEventModel: public QAbstractListModel
         Q_OBJECT
         Q_PROPERTY(QuaternionRoom* room MEMBER m_currentRoom CONSTANT)
         Q_PROPERTY(int lastShownIndex MEMBER lastShownIndex NOTIFY lastShownIndexChanged)
+        Q_PROPERTY(int readMarkerIndex MEMBER m_readMarkerIndex NOTIFY readMarkerIndexChanged)
     public:
         MessageEventModel(QObject* parent = nullptr);
         virtual ~MessageEventModel();
@@ -42,15 +43,20 @@ class MessageEventModel: public QAbstractListModel
         QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
         QHash<int, QByteArray> roleNames() const override;
 
+        bool awaitingMarkRead();
+
     signals:
         void lastShownIndexChanged(int newValue);
+        void readMarkerIndexChanged(int newValue);
 
     public slots:
         void markShownAsRead();
+        void updateReadMarkerIndex();
 
     private:
         QuaternionRoom* m_currentRoom;
         int lastShownIndex;
+        int m_readMarkerIndex;
 };
 
 #endif // LOGMESSAGEMODEL_H