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

QWindows11Style: Make ItemViews respect alternating row colors

Browse Source 
Fixes: QTBUG-124564
Pick-to: 6.7
Change-Id: I2665ecb253d0413d57e67d598593e8064b1ab84e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 5d73d64f3eaab51518a4385e2a0a3cec8be91769)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Wladimir Leuschner 2024-04-23 11:20:26 +02:00 committed by Qt Cherry-pick Bot
parent af8f5d3aaa
commit d1e523c8b6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,6 +994,13 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
}
case QStyle::PE_PanelItemViewRow:
if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(option)) {
painter->setPen(Qt::NoPen);
if (vopt->features & QStyleOptionViewItem::Alternate)
painter->setBrush(vopt->palette.alternateBase());
else
painter->setBrush(vopt->palette.base());
int markerOffset = 2;
painter->drawRect(vopt->rect.marginsRemoved(QMargins(markerOffset, 0, -markerOffset, 0)));
if ((vopt->state & State_Selected || vopt->state & State_MouseOver) && vopt->showDecorationSelected) {
painter->setBrush(WINUI3Colors[colorSchemeIndex][subtleHighlightColor]);
painter->setPen(Qt::NoPen);
@ -2146,6 +2153,7 @@ static void populateLightSystemBasePalette(QPalette &result)
const QColor textColor = QColor(0x00,0x00,0x00,0xE4);
const QColor btnFace = QColor(0xFF,0xFF,0xFF,0xB3);
const QColor alternateBase = QColor(0x00,0x00,0x00,0x09);
const QColor btnHighlight = result.accent().color();
const QColor btnColor = result.button().color();
@ -2164,6 +2172,7 @@ static void populateLightSystemBasePalette(QPalette &result)
SET_IF_UNRESOLVED(QPalette::All, QPalette::Shadow, Qt::black);
SET_IF_UNRESOLVED(QPalette::All, QPalette::ToolTipBase, result.window().color());
SET_IF_UNRESOLVED(QPalette::All, QPalette::ToolTipText, result.windowText().color());
SET_IF_UNRESOLVED(QPalette::All, QPalette::AlternateBase, alternateBase);
if (result.midlight() == result.button())
result.setColor(QPalette::Midlight, btnColor.lighter(110));