Display message being replied to above input box

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Minor: Add an option to use new experimental smarter emote completion. (#4987)
 - Minor: Add `--safe-mode` command line option that can be used for troubleshooting when Chatterino is misbehaving or is misconfigured. It disables hiding the settings button & prevents plugins from loading. (#4985)
 - Minor: Updated the flatpakref link included with nightly builds to point to up-to-date flathub-beta builds. (#5008)
+- Minor: Replying to a message will now display the message being replied to. (#4350)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
 - Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)

src/CMakeLists.txt

@@ -604,6 +604,8 @@ set(SOURCE_FILES
         widgets/helper/EffectLabel.hpp
         widgets/helper/InvisibleSizeGrip.cpp
         widgets/helper/InvisibleSizeGrip.hpp
+        widgets/helper/MessageView.cpp
+        widgets/helper/MessageView.hpp
         widgets/helper/NotebookButton.cpp
         widgets/helper/NotebookButton.hpp
         widgets/helper/NotebookTab.cpp

src/widgets/helper/MessageView.cpp

@@ -0,0 +1,159 @@
+#include "MessageView.hpp"
+
+#include "Application.hpp"
+#include "messages/layouts/MessageLayout.hpp"
+#include "messages/Selection.hpp"
+#include "providers/colors/ColorProvider.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
+#include "singletons/WindowManager.hpp"
+
+#include <QApplication>
+#include <QPainter>
+
+namespace chatterino {
+
+namespace {
+    static const Selection emptySelection;
+}
+
+MessageView::MessageView()
+    : MessageView(nullptr)
+{
+}
+
+MessageView::MessageView(MessagePtr message)
+    : message_(std::move(message))
+    , width_(0)
+{
+    this->createMessageLayout();
+
+    // Configure theme and preferences for rendering message
+    this->messageColors_.applyTheme(getTheme());
+    this->messagePreferences_.connectSettings(getSettings(),
+                                              this->signalHolder_);
+
+    // Update frame for any GIFs
+    this->signalHolder_.managedConnect(
+        getIApp()->getWindows()->gifRepaintRequested, [&] {
+            this->maybeUpdate();
+        });
+
+    // Re-layout and potentially update if base flags change (e.g. settings for badges).
+    this->signalHolder_.managedConnect(getApp()->windows->wordFlagsChanged,
+                                       [this] {
+                                           this->layoutMessage();
+                                       });
+}
+
+MessageView::~MessageView()
+{
+}
+
+void MessageView::createMessageLayout()
+{
+    if (this->message_ == nullptr)
+    {
+        this->messageLayout_.reset();
+        return;
+    }
+
+    this->messageLayout_ = std::make_unique<MessageLayout>(this->message_);
+}
+
+void MessageView::setMessage(MessagePtr message)
+{
+    if (this->message_ != message)
+    {
+        this->message_ = std::move(message);
+        this->createMessageLayout();
+        this->layoutMessage();
+    }
+}
+
+void MessageView::clearMessage()
+{
+    this->setMessage(nullptr);
+}
+
+void MessageView::setWidth(int width)
+{
+    if (this->width_ != width)
+    {
+        this->width_ = width;
+        this->layoutMessage();
+    }
+}
+
+void MessageView::paintEvent(QPaintEvent * /*event*/)
+{
+    QPainter painter(this);
+
+    auto ctx = MessagePaintContext{
+        .painter = painter,
+        .selection = emptySelection,
+        .colorProvider = ColorProvider::instance(),
+        .messageColors = this->messageColors_,
+        .preferences = this->messagePreferences_,
+
+        .canvasWidth = this->width_,
+        .isWindowFocused = this->window() == QApplication::activeWindow(),
+        .isMentions = false,
+
+        .y = 0,
+        .messageIndex = 0,
+        .isLastReadMessage = false,
+    };
+
+    this->messageLayout_->paint(ctx);
+}
+
+void MessageView::themeChangedEvent()
+{
+    this->layoutMessage();
+}
+
+void MessageView::scaleChangedEvent(float /*newScale*/)
+{
+    this->layoutMessage();
+}
+
+void MessageView::maybeUpdate()
+{
+    if (this->messageLayout_ != nullptr)
+    {
+        this->update();
+    }
+}
+
+void MessageView::layoutMessage()
+{
+    if (this->messageLayout_ == nullptr)
+    {
+        return;
+    }
+
+    auto flags = getFlags();
+    bool updateRequired =
+        this->messageLayout_->layout(this->width_, this->scale(), flags);
+
+    if (updateRequired)
+    {
+        this->setFixedSize(this->width_, this->messageLayout_->getHeight());
+        this->update();
+    }
+}
+
+MessageElementFlags MessageView::getFlags() const
+{
+    // Start with base global flags
+    auto flags = getIApp()->getWindows()->getWordFlags();
+
+    // Don't show inline replies or reply button
+    flags.unset(MessageElementFlag::RepliedMessage);
+    flags.unset(MessageElementFlag::ReplyButton);
+
+    return flags;
+}
+
+}  // namespace chatterino

src/widgets/helper/MessageView.hpp

@@ -0,0 +1,53 @@
+#pragma once
+
+#include "messages/layouts/MessageLayoutContext.hpp"
+#include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
+#include "widgets/BaseWidget.hpp"
+
+#include <QWidget>
+
+namespace chatterino {
+
+class MessageLayout;
+
+/// MessageView is a fixed-width widget that displays a single message.
+/// For the message to be rendered, you must call setWidth.
+class MessageView : public BaseWidget
+{
+    Q_OBJECT
+
+public:
+    MessageView();
+    MessageView(MessagePtr message);
+
+    ~MessageView() override;
+
+    void setMessage(MessagePtr message);
+    void clearMessage();
+
+    void setWidth(int width);
+
+protected:
+    void paintEvent(QPaintEvent * /*event*/) override;
+    void themeChangedEvent() override;
+    void scaleChangedEvent(float /*newScale*/) override;
+
+private:
+    void createMessageLayout();
+    void maybeUpdate();
+    void layoutMessage();
+
+    MessageElementFlags getFlags() const;
+
+private:
+    MessagePtr message_;
+    std::unique_ptr<MessageLayout> messageLayout_;
+
+    MessageColors messageColors_;
+    MessagePreferences messagePreferences_;
+
+    int width_;
+};
+
+}  // namespace chatterino