1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows11Style: Use pixmap cache for drawing CC_ScrollBar

Browse Source 
Use a pixmap cache for CC_ScrollBar to avoid redundant paintings.

Change-Id: I677d6162a58e5fff9e53ad515e99436ea1546b0c
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Christian Ehrlicher 2024-09-21 19:59:30 +02:00
parent cd6608e887
commit 57f461e21a
1 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -471,62 +471,69 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
#endif // QT_CONFIG(combobox) #endif // QT_CONFIG(combobox)
case CC_ScrollBar: case CC_ScrollBar:
if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(option)) { if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
const bool vertical = scrollbar->orientation == Qt::Vertical; QCachedPainter cp(painter, QLatin1StringView("win11_scrollbar")
const bool horizontal = scrollbar->orientation == Qt::Horizontal; % HexString<uint8_t>(colorSchemeIndex)
const bool isMouseOver = state & State_MouseOver; % HexString<int>(scrollbar->minimum)
% HexString<int>(scrollbar->maximum)
% HexString<int>(scrollbar->sliderPosition),
scrollbar, scrollbar->rect.size());
if (cp.needsPainting()) {
const bool vertical = scrollbar->orientation == Qt::Vertical;
const bool horizontal = scrollbar->orientation == Qt::Horizontal;
const bool isMouseOver = state & State_MouseOver;
if (isMouseOver) {
QRectF rect = scrollbar->rect;
const QPointF center = rect.center();
if (vertical && rect.width() > 24) {
rect.marginsRemoved(QMargins(0, 2, 2, 2));
rect.setWidth(rect.width() / 2);
} else if (horizontal && rect.height() > 24) {
rect.marginsRemoved(QMargins(2, 0, 2, 2));
rect.setHeight(rect.height() / 2);
}
rect.moveCenter(center);
painter->setBrush(scrollbar->palette.base());
painter->setPen(Qt::NoPen);
painter->drawRoundedRect(rect, topLevelRoundingRadius, topLevelRoundingRadius);
rect = rect.marginsRemoved(QMarginsF(0.5, 0.5, 0.5, 0.5));
painter->setBrush(Qt::NoBrush);
painter->setPen(WINUI3Colors[colorSchemeIndex][frameColorLight]);
painter->drawRoundedRect(rect, topLevelRoundingRadius + 0.5, topLevelRoundingRadius + 0.5);
}
if (sub & SC_ScrollBarSlider) {
QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarSlider, widget);
const QPointF center = rect.center();
if (vertical)
rect.setWidth(isMouseOver ? rect.width() / 2 : 1);
else
rect.setHeight(isMouseOver ? rect.height() / 2 : 1);
rect.moveCenter(center);
painter->setBrush(Qt::gray);
painter->setPen(Qt::NoPen);
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
}
if (sub & SC_ScrollBarAddLine) {
if (isMouseOver) { if (isMouseOver) {
const QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarAddLine, widget); QRectF rect = scrollbar->rect;
QFont f(assetFont); const QPointF center = rect.center();
f.setPointSize(6); if (vertical && rect.width() > 24) {
painter->setFont(f); rect.marginsRemoved(QMargins(0, 2, 2, 2));
painter->setPen(Qt::gray); rect.setWidth(rect.width() / 2);
const auto str = vertical ? QStringLiteral("\uEDDC") : QStringLiteral("\uEDDA"); } else if (horizontal && rect.height() > 24) {
painter->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter); rect.marginsRemoved(QMargins(2, 0, 2, 2));
rect.setHeight(rect.height() / 2);
}
rect.moveCenter(center);
cp->setBrush(scrollbar->palette.base());
cp->setPen(Qt::NoPen);
cp->drawRoundedRect(rect, topLevelRoundingRadius, topLevelRoundingRadius);
rect = rect.marginsRemoved(QMarginsF(0.5, 0.5, 0.5, 0.5));
cp->setBrush(Qt::NoBrush);
cp->setPen(WINUI3Colors[colorSchemeIndex][frameColorLight]);
cp->drawRoundedRect(rect, topLevelRoundingRadius + 0.5, topLevelRoundingRadius + 0.5);
} }
} if (sub & SC_ScrollBarSlider) {
if (sub & SC_ScrollBarSubLine) { QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarSlider, widget);
if (isMouseOver) { const QPointF center = rect.center();
const QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarSubLine, widget); if (vertical)
QFont f(assetFont); rect.setWidth(isMouseOver ? rect.width() / 2 : 1);
f.setPointSize(6); else
painter->setFont(f); rect.setHeight(isMouseOver ? rect.height() / 2 : 1);
painter->setPen(Qt::gray); rect.moveCenter(center);
const auto str = vertical ? QStringLiteral("\uEDDB") : QStringLiteral("\uEDD9"); cp->setBrush(Qt::gray);
painter->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter); cp->setPen(Qt::NoPen);
cp->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
}
if (sub & SC_ScrollBarAddLine) {
if (isMouseOver) {
const QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarAddLine, widget);
QFont f = QFont(assetFont);
f.setPointSize(6);
cp->setFont(f);
cp->setPen(Qt::gray);
const auto str = vertical ? QStringLiteral("\uEDDC") : QStringLiteral("\uEDDA");
cp->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter);
}
}
if (sub & SC_ScrollBarSubLine) {
if (isMouseOver) {
const QRectF rect = proxy()->subControlRect(CC_ScrollBar, option, SC_ScrollBarSubLine, widget);
QFont f = QFont(assetFont);
f.setPointSize(6);
cp->setFont(f);
cp->setPen(Qt::gray);
const auto str = vertical ? QStringLiteral("\uEDDB") : QStringLiteral("\uEDD9");
cp->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter);
}
} }
} }
} }