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

Flatten the scrollbar highlight iteration (#3326)

Browse source
This commit is contained in:
pajlada 2021-10-30 12:54:43 +02:00 committed by GitHub
parent c33efab751
commit 8ead95b959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/widgets/Scrollbar.cpp
View file

@ -287,22 +287,28 @@ void Scrollbar::paintEvent(QPaintEvent *)
int highlightHeight = int highlightHeight =
int(std::ceil(std::max<float>(this->scale() * 2, dY))); int(std::ceil(std::max<float>(this->scale() * 2, dY)));
for (size_t i = 0; i < snapshotLength; i++) for (size_t i = 0; i < snapshotLength; i++, y += dY)
{ {
ScrollbarHighlight const &highlight = snapshot[i]; ScrollbarHighlight const &highlight = snapshot[i];
if (!highlight.isNull()) if (highlight.isNull())
{ {
if (!highlight.isRedeemedHighlight() || enableRedeemedHighlights) continue;
}
if (highlight.isRedeemedHighlight() && !enableRedeemedHighlights)
{ {
continue;
}
QColor color = highlight.getColor(); QColor color = highlight.getColor();
color.setAlpha(255); color.setAlpha(255);
switch (highlight.getStyle()) switch (highlight.getStyle())
{ {
case ScrollbarHighlight::Default: { case ScrollbarHighlight::Default: {
painter.fillRect(w / 8 * 3, int(y), w / 4, painter.fillRect(w / 8 * 3, int(y), w / 4, highlightHeight,
highlightHeight, color); color);
} }
break; break;
@ -314,10 +320,6 @@ void Scrollbar::paintEvent(QPaintEvent *)
case ScrollbarHighlight::None:; case ScrollbarHighlight::None:;
} }
} }
}
y += dY;
}
} }
void Scrollbar::resizeEvent(QResizeEvent *) void Scrollbar::resizeEvent(QResizeEvent *)