Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev

resources/styles/nheko-dark.qss

@@ -41,6 +41,10 @@ SuggestionsPopup {
     background-color: #202228;
 }
 
+ReplyPopup {
+    background-color: #202228;
+}
+
 PopupItem {
     background-color: #202228;
     qproperty-hoverColor: rgba(45, 49, 57, 120);

resources/styles/nheko.qss

@@ -46,6 +46,10 @@ SuggestionsPopup {
     background-color: white;
 }
 
+ReplyPopup {
+    background-color: white;
+}
+
 PopupItem {
     background-color: white;
     qproperty-hoverColor: rgba(192, 193, 195, 120);

src/ChatPage.h

@@ -83,7 +83,9 @@ signals:
         void connectionLost();
         void connectionRestored();
 
-        void messageReply(const QString &username, const QString &msg, const QString &related_event);
+        void messageReply(const QString &username,
+                          const QString &msg,
+                          const QString &related_event);
 
         void notificationsRetrieved(const mtx::responses::Notifications &);
 

src/TextInputWidget.cpp

@@ -76,7 +76,7 @@ FilteredTextEdit::FilteredTextEdit(QWidget *parent)
                 &FilteredTextEdit::uploadData);
 
         connect(this, &FilteredTextEdit::resultsRetrieved, this, &FilteredTextEdit::showResults);
-        connect(&replyPopup_, &ReplyPopup::userSelected, this, [this](const QString &text) {
+        connect(&replyPopup_, &ReplyPopup::userSelected, this, [](const QString &text) {
                 // TODO: Show user avatar window.
                 nhlog::ui()->info("User selected: " + text.toStdString());
         });
@@ -176,8 +176,7 @@ FilteredTextEdit::keyPressEvent(QKeyEvent *event)
         }
 
         if (replyPopup_.isVisible()) {
-                switch (event->key())
+                switch (event->key()) {
-                {
                 case Qt::Key_Escape:
                         closeReply();
                         return;
@@ -187,7 +186,6 @@ FilteredTextEdit::keyPressEvent(QKeyEvent *event)
                 }
         }
 
-
         switch (event->key()) {
         case Qt::Key_At:
                 atTriggerPosition_ = textCursor().position();

src/TextInputWidget.h

@@ -28,10 +28,10 @@
 #include <QTextEdit>
 #include <QWidget>
 
-#include "popups/SuggestionsPopup.h"
-#include "popups/ReplyPopup.h"
 #include "dialogs/PreviewUploadOverlay.h"
 #include "emoji/PickButton.h"
+#include "popups/ReplyPopup.h"
+#include "popups/SuggestionsPopup.h"
 
 namespace dialogs {
 class PreviewUploadOverlay;

src/popups/PopupItem.cpp

@@ -2,9 +2,9 @@
 #include <QPainter>
 #include <QStyleOption>
 
-#include "PopupItem.h"
 #include "../Utils.h"
 #include "../ui/Avatar.h"
+#include "PopupItem.h"
 
 constexpr int PopupHMargin    = 4;
 constexpr int PopupItemMargin = 3;

src/popups/ReplyPopup.cpp

@@ -1,5 +1,5 @@
-#include <QPaintEvent>
 #include <QLabel>
+#include <QPaintEvent>
 #include <QPainter>
 #include <QStyleOption>
 
@@ -32,7 +32,7 @@ ReplyPopup::setReplyContent(const QString &user, const QString &msg, const QStri
         // layout position.
         // if (!item) {
         auto userItem = new UserItem(this, user);
-        auto *text = new QLabel(this);
+        auto *text    = new QLabel(this);
         text->setText(msg);
         auto *event = new QLabel(this);
         event->setText(srcEvent);

src/popups/ReplyPopup.h

@@ -28,5 +28,4 @@ signals:
 
 private:
         QVBoxLayout *layout_;
-
 };

src/popups/SuggestionsPopup.cpp

@@ -3,10 +3,10 @@
 #include <QStyleOption>
 
 #include "../Config.h"
-#include "SuggestionsPopup.h"
 #include "../Utils.h"
 #include "../ui/Avatar.h"
 #include "../ui/DropShadow.h"
+#include "SuggestionsPopup.h"
 
 SuggestionsPopup::SuggestionsPopup(QWidget *parent)
   : QWidget(parent)

src/popups/SuggestionsPopup.h

@@ -10,7 +10,6 @@
 #include "../ChatPage.h"
 #include "PopupItem.h"
 
-
 class SuggestionsPopup : public QWidget
 {
         Q_OBJECT

src/timeline/TimelineView.cpp

@@ -690,7 +690,9 @@ TimelineView::updatePendingMessage(const std::string &txn_id, const QString &eve
 }
 
 void
-TimelineView::addUserMessage(mtx::events::MessageType ty, const QString &body, const QString &related_event)
+TimelineView::addUserMessage(mtx::events::MessageType ty,
+                             const QString &body,
+                             const QString &related_event)
 {
         auto with_sender = (lastSender_ != local_user_) || isDateDifference(lastMsgTimestamp_);
 

src/timeline/TimelineView.h

@@ -121,7 +121,9 @@ public:
 
         // Add new events at the end of the timeline.
         void addEvents(const mtx::responses::Timeline &timeline);
-        void addUserMessage(mtx::events::MessageType ty, const QString &body, const QString &related_event);
+        void addUserMessage(mtx::events::MessageType ty,
+                            const QString &body,
+                            const QString &related_event);
         void addUserMessage(mtx::events::MessageType ty, const QString &msg);
 
         template<class Widget, mtx::events::MessageType MsgType>

src/timeline/TimelineViewManager.cpp

@@ -79,8 +79,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
 }
 
 void
-TimelineViewManager::queueReplyMessage(const QString &reply,
+TimelineViewManager::queueReplyMessage(const QString &reply, const QString &related_event)
-                                       const QString &related_event)
 {
         if (active_room_.isEmpty())
                 return;