From 8a1666bc889d963693b5dff8f0b4c7612319644a Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 15 Jul 2021 20:37:52 +0200
Subject: Basic sticker support

---
 src/timeline/TimelineViewManager.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b39ef615..ec1b3573 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -19,6 +19,7 @@
 #include "DelegateChooser.h"
 #include "DeviceVerificationFlow.h"
 #include "EventAccessors.h"
+#include "ImagePackModel.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
@@ -144,6 +145,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
         qRegisterMetaType<mtx::events::msg::KeyVerificationReady>();
         qRegisterMetaType<mtx::events::msg::KeyVerificationRequest>();
         qRegisterMetaType<mtx::events::msg::KeyVerificationStart>();
+        qRegisterMetaType<ImagePackModel *>();
 
         qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
                                          "im.nheko",
@@ -593,6 +595,11 @@ TimelineViewManager::completerFor(QString completerName, QString roomId)
                 auto proxy     = new CompletionProxyModel(roomModel);
                 roomModel->setParent(proxy);
                 return proxy;
+        } else if (completerName == "stickers") {
+                auto stickerModel = new ImagePackModel(roomId.toStdString(), true);
+                auto proxy        = new CompletionProxyModel(stickerModel);
+                stickerModel->setParent(proxy);
+                return proxy;
         }
         return nullptr;
 }
-- 
cgit 1.5.1


From 9f416f1fc9cc3a973159b2a5a84ee668ffbc5063 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 19 Jul 2021 12:43:16 +0200
Subject: Fix only first 7 stickers showing up

---
 src/ImagePackModel.cpp               | 6 ++++++
 src/ImagePackModel.h                 | 6 +-----
 src/timeline/TimelineViewManager.cpp | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/ImagePackModel.cpp b/src/ImagePackModel.cpp
index 4345e383..9b0dca8d 100644
--- a/src/ImagePackModel.cpp
+++ b/src/ImagePackModel.cpp
@@ -26,6 +26,12 @@ ImagePackModel::ImagePackModel(const std::string &roomId, bool stickers, QObject
         }
 }
 
+int
+ImagePackModel::rowCount(const QModelIndex &) const
+{
+        return (int)images.size();
+}
+
 QHash<int, QByteArray>
 ImagePackModel::roleNames() const
 {
diff --git a/src/ImagePackModel.h b/src/ImagePackModel.h
index 10e71b8f..937014ec 100644
--- a/src/ImagePackModel.h
+++ b/src/ImagePackModel.h
@@ -23,11 +23,7 @@ public:
 
         ImagePackModel(const std::string &roomId, bool stickers, QObject *parent = nullptr);
         QHash<int, QByteArray> roleNames() const override;
-        int rowCount(const QModelIndex &parent = QModelIndex()) const override
-        {
-                (void)parent;
-                return (int)images.size();
-        }
+        int rowCount(const QModelIndex &parent = QModelIndex()) const override;
         QVariant data(const QModelIndex &index, int role) const override;
 
         mtx::events::msc2545::PackImage imageAt(int row)
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index ec1b3573..3e69f92b 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -597,7 +597,7 @@ TimelineViewManager::completerFor(QString completerName, QString roomId)
                 return proxy;
         } else if (completerName == "stickers") {
                 auto stickerModel = new ImagePackModel(roomId.toStdString(), true);
-                auto proxy        = new CompletionProxyModel(stickerModel);
+                auto proxy = new CompletionProxyModel(stickerModel, 1, static_cast<size_t>(-1) / 4);
                 stickerModel->setParent(proxy);
                 return proxy;
         }
-- 
cgit 1.5.1