noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

make highlighted messages and redeemed thingies look the same

Browse source
This commit is contained in:
fourtf 2020-08-22 16:02:38 +02:00
parent 17b26ef59c
commit 2cc23eaae6
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/messages/Message.cpp
View file

@ -35,7 +35,8 @@ SBHighlight Message::getScrollBarHighlight() const
return SBHighlight( return SBHighlight(
ColorProvider::instance().color(ColorType::Subscription)); ColorProvider::instance().color(ColorType::Subscription));
} }
else if (this->flags.has(MessageFlag::RedeemedHighlight)) else if (this->flags.has(MessageFlag::RedeemedHighlight) ||
this->flags.has(MessageFlag::RedeemedChannelPointReward))
{ {
return SBHighlight( return SBHighlight(
ColorProvider::instance().color(ColorType::RedeemedHighlight), ColorProvider::instance().color(ColorType::RedeemedHighlight),

8
src/messages/layouts/MessageLayout.cpp
View file

@ -221,7 +221,9 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
} }
if (!isMentions && if (!isMentions &&
this->message_->flags.has(MessageFlag::RedeemedChannelPointReward)) (this->message_->flags.has(MessageFlag::RedeemedChannelPointReward) ||
this->message_->flags.has(MessageFlag::RedeemedHighlight)) &&
getSettings()->enableRedeemedHighlight.getValue())
{ {
painter.fillRect( painter.fillRect(
0, y, this->scale_ * 4, pixmap->height(), 0, y, this->scale_ * 4, pixmap->height(),
@ -305,7 +307,9 @@ void MessageLayout::updateBuffer(QPixmap *buffer, int /*messageIndex*/,
backgroundColor, backgroundColor,
*ColorProvider::instance().color(ColorType::Subscription)); *ColorProvider::instance().color(ColorType::Subscription));
} }
else if (this->message_->flags.has(MessageFlag::RedeemedHighlight) && else if ((this->message_->flags.has(MessageFlag::RedeemedHighlight) ||
this->message_->flags.has(
MessageFlag::RedeemedChannelPointReward)) &&
settings->enableRedeemedHighlight.getValue()) settings->enableRedeemedHighlight.getValue())
{ {
// Blend highlight color with usual background color // Blend highlight color with usual background color