Add Basic Elevated Message support (#4016)
This commit is contained in:
@@ -257,6 +257,8 @@ void Scrollbar::paintEvent(QPaintEvent *)
|
||||
bool enableRedeemedHighlights = getSettings()->enableRedeemedHighlight;
|
||||
bool enableFirstMessageHighlights =
|
||||
getSettings()->enableFirstMessageHighlight;
|
||||
bool enableElevatedMessageHighlights =
|
||||
getSettings()->enableElevatedMessageHighlight;
|
||||
|
||||
// painter.fillRect(QRect(xOffset, 0, width(), this->buttonHeight),
|
||||
// this->themeManager->ScrollbarArrow);
|
||||
@@ -313,6 +315,12 @@ void Scrollbar::paintEvent(QPaintEvent *)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (highlight.isElevatedMessageHighlight() &&
|
||||
!enableElevatedMessageHighlights)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QColor color = highlight.getColor();
|
||||
color.setAlpha(255);
|
||||
|
||||
|
||||
@@ -14,11 +14,13 @@ ScrollbarHighlight::ScrollbarHighlight()
|
||||
|
||||
ScrollbarHighlight::ScrollbarHighlight(const std::shared_ptr<QColor> color,
|
||||
Style style, bool isRedeemedHighlight,
|
||||
bool isFirstMessageHighlight)
|
||||
bool isFirstMessageHighlight,
|
||||
bool isElevatedMessageHighlight)
|
||||
: color_(color)
|
||||
, style_(style)
|
||||
, isRedeemedHighlight_(isRedeemedHighlight)
|
||||
, isFirstMessageHighlight_(isFirstMessageHighlight)
|
||||
, isElevatedMessageHighlight_(isElevatedMessageHighlight)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -42,6 +44,11 @@ bool ScrollbarHighlight::isFirstMessageHighlight() const
|
||||
return this->isFirstMessageHighlight_;
|
||||
}
|
||||
|
||||
bool ScrollbarHighlight::isElevatedMessageHighlight() const
|
||||
{
|
||||
return this->isElevatedMessageHighlight_;
|
||||
}
|
||||
|
||||
bool ScrollbarHighlight::isNull() const
|
||||
{
|
||||
return this->style_ == None || !this->color_;
|
||||
|
||||
@@ -22,12 +22,14 @@ public:
|
||||
|
||||
ScrollbarHighlight(const std::shared_ptr<QColor> color,
|
||||
Style style = Default, bool isRedeemedHighlight = false,
|
||||
bool isFirstMessageHighlight = false);
|
||||
bool isFirstMessageHighlight = false,
|
||||
bool isElevatedMessageHighlight = false);
|
||||
|
||||
QColor getColor() const;
|
||||
Style getStyle() const;
|
||||
bool isRedeemedHighlight() const;
|
||||
bool isFirstMessageHighlight() const;
|
||||
bool isElevatedMessageHighlight() const;
|
||||
bool isNull() const;
|
||||
|
||||
private:
|
||||
@@ -35,6 +37,7 @@ private:
|
||||
Style style_;
|
||||
bool isRedeemedHighlight_;
|
||||
bool isFirstMessageHighlight_;
|
||||
bool isElevatedMessageHighlight_;
|
||||
};
|
||||
|
||||
} // namespace chatterino
|
||||
|
||||
Reference in New Issue
Block a user