chatterino2
Code Issues

Fix underlying text from disabled emotes not being colorized after using /me (#3333)

Browse Source
This commit is contained in:
Ryan
2021-10-31 06:37:06 -04:00
committed by GitHub
parent b4b745024c
commit b4be7a4b1f
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/MessageElement.cpp
+4 -3
View File
@@ -142,12 +142,13 @@ void ImageElement::addToContainer(MessageLayoutContainer &container,
}
// EMOTE
EmoteElement::EmoteElement(const EmotePtr &emote, MessageElementFlags flags)
EmoteElement::EmoteElement(const EmotePtr &emote, MessageElementFlags flags,
const MessageColor &textElementColor)
: MessageElement(flags)
, emote_(emote)
{
this->textElement_.reset(
new TextElement(emote->getCopyString(), MessageElementFlag::Misc));
this->textElement_.reset(new TextElement(
emote->getCopyString(), MessageElementFlag::Misc, textElementColor));
this->setTooltip(emote->tooltip.string);
}
src/messages/MessageElement.hpp
+2 -1
View File
@@ -238,7 +238,8 @@ private:
class EmoteElement : public MessageElement
{
public:
EmoteElement(const EmotePtr &data, MessageElementFlags flags_);
EmoteElement(const EmotePtr &data, MessageElementFlags flags_,
const MessageColor &textElementColor = MessageColor::Text);
void addToContainer(MessageLayoutContainer &container,
MessageElementFlags flags_) override;