fix: don't render paints in system messages

Fixes #111
SevenTV · Sep 14, 2024 · b55e723 · b55e723
1 parent 218a486
commit b55e723
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/src/messages/MessageColor.hpp b/src/messages/MessageColor.hpp
@@ -6,11 +6,16 @@ namespace chatterino {
 class Theme;
 
 struct MessageColor {
-    enum Type { Custom, Text, Link, System };
+    enum Type : uint8_t { Custom, Text, Link, System };
 
     MessageColor(const QColor &color);
     MessageColor(Type type_ = Text);
 
+    Type type() const
+    {
+        return this->type_;
+    }
+
     const QColor &getColor(Theme &themeManager) const;
 
 private:

diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
@@ -573,7 +573,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
 
                 auto *e = new TextLayoutElement(
                     *this, text, QSize(width, metrics.height()), color,
-                    this->style_, container.getScale());
+                    this->style_, this->color_.type(), container.getScale());
                 e->setTrailingSpace(hasTrailingSpace);
                 e->setText(text);
                 e->setWordId(wordId);
@@ -690,7 +690,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
 
             auto *e = new TextLayoutElement(
                 *this, text, QSize(width, metrics.height()), color,
-                this->style_, container.getScale());
+                this->style_, this->color_.type(), container.getScale());
             e->setTrailingSpace(hasTrailingSpace);
             e->setText(text);
 

diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -75,7 +75,8 @@ void MessageLayoutContainer::endLayout()
         auto *element = new TextLayoutElement(
             dotdotdot, dotdotdotText,
             QSize(this->dotdotdotWidth_, this->textLineHeight_),
-            QColor("#00D80A"), FontStyle::ChatMediumBold, this->scale_);
+            QColor("#00D80A"), FontStyle::ChatMediumBold, MessageColor::Text,
+            this->scale_);
 
         if (this->isRTL())
         {

diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp
@@ -419,10 +419,13 @@ void ImageWithCircleBackgroundLayoutElement::paint(
 
 TextLayoutElement::TextLayoutElement(MessageElement &_creator, QString &_text,
                                      const QSize &_size, QColor _color,
-                                     FontStyle _style, float _scale)
+                                     FontStyle _style,
+                                     MessageColor::Type messageColor,
+                                     float _scale)
     : MessageLayoutElement(_creator, _size)
     , color_(_color)
     , style_(_style)
+    , messageColor_(messageColor)
     , scale_(_scale)
 {
     this->setText(_text);
@@ -458,7 +461,8 @@ void TextLayoutElement::paint(QPainter &painter,
 
     bool isNametag = this->getLink().type == chatterino::Link::UserInfo ||
                      this->getLink().type == chatterino::Link::UserWhisper;
-    bool drawPaint = isNametag && getSettings()->displaySevenTVPaints;
+    bool drawPaint = isNametag && this->messageColor_ != MessageColor::System &&
+                     getSettings()->displaySevenTVPaints;
     auto seventvPaint =
         app->getSeventvPaints()->getPaint(this->getLink().value.toLower());
     if (drawPaint && seventvPaint.has_value())

diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp
@@ -2,6 +2,7 @@
 
 #include "common/FlagsEnum.hpp"
 #include "messages/Link.hpp"
+#include "messages/MessageColor.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
 #include <QPen>
@@ -170,7 +171,7 @@ class TextLayoutElement : public MessageLayoutElement
 public:
     TextLayoutElement(MessageElement &creator_, QString &text,
                       const QSize &size, QColor color_, FontStyle style_,
-                      float scale_);
+                      MessageColor::Type messageColor, float scale_);
 
 protected:
     void addCopyTextToString(QString &str, uint32_t from = 0,
@@ -183,6 +184,9 @@ class TextLayoutElement : public MessageLayoutElement
 
     QColor color_;
     FontStyle style_;
+    // 7tv: this is used to check for system messages - it doesn't take extra
+    // space (fits in the padding of `style_`)
+    MessageColor::Type messageColor_;
     float scale_;
 };