Merge pull request #1394 from Nheko-Reborn/uiTweaks

Some small UI changes

4 files changed, 13 insertions, 4 deletions

diff --git a/src/InviteesModel.cpp b/src/InviteesModel.cpp

index 2b95a36f..7b49c234 100644
--- a/src/InviteesModel.cpp
+++ b/src/InviteesModel.cpp
@@ -9,8 +9,9 @@
 #include "MatrixClient.h"
 #include "mtx/responses/profile.hpp"
 
-InviteesModel::InviteesModel(QObject *parent)
+InviteesModel::InviteesModel(TimelineModel *room, QObject *parent)
   : QAbstractListModel{parent}
+  , room_{room}
 {
 }
 
diff --git a/src/InviteesModel.h b/src/InviteesModel.h

index 8fe8fc22..ab8fbdb4 100644
--- a/src/InviteesModel.h
+++ b/src/InviteesModel.h
@@ -8,6 +8,8 @@
 #include <QAbstractListModel>
 #include <QVector>
 
+class TimelineModel;
+
 class Invitee final : public QObject
 {
     Q_OBJECT
@@ -34,6 +36,7 @@ class InviteesModel final : public QAbstractListModel
     Q_OBJECT
 
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+    Q_PROPERTY(TimelineModel *room READ room CONSTANT)
 
 public:
     enum Roles
@@ -43,7 +46,9 @@ public:
         AvatarUrl,
     };
 
-    InviteesModel(QObject *parent = nullptr);
+    InviteesModel(TimelineModel *room, QObject *parent = nullptr);
+
+    TimelineModel *room() const { return room_; }
 
     Q_INVOKABLE void addUser(QString mxid, QString displayName = "", QString avatarUrl = "");
     Q_INVOKABLE void removeUser(QString mxid);
@@ -63,6 +68,7 @@ signals:
 
 private:
     QVector<Invitee *> invitees_;
+    TimelineModel *room_;
 };
 
 #endif // INVITEESMODEL_H
diff --git a/src/Utils.cpp b/src/Utils.cpp

index b753cfdb..63dcdd00 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -141,7 +141,9 @@ utils::replaceEmoji(const QString &body)
         if (!insideTag && utils::codepointIsEmoji(code)) {
             if (!insideFontBlock) {
                 fmtBody += QStringLiteral("<font face=\"") % UserSettings::instance()->emojiFont() %
-                           QStringLiteral("\">");
+                           (UserSettings::instance()->enlargeEmojiOnlyMessages()
+                              ? QStringLiteral("\" size=\"4\">")
+                              : QStringLiteral("\">"));
                 insideFontBlock = true;
             } else if (code == 0xfe0f) {
                 // BUG(Nico):
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index cdcc689d..c19d0c3f 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -180,7 +180,7 @@ TimelineViewManager::openRoomSettings(QString room_id)
 void
 TimelineViewManager::openInviteUsers(QString roomId)
 {
-    InviteesModel *model = new InviteesModel{};
+    InviteesModel *model = new InviteesModel{rooms_->getRoomById(roomId).data()};
     connect(model, &InviteesModel::accept, this, [this, model, roomId]() {
         emit inviteUsers(roomId, model->mxids());
     });