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

Set the PlaceholderText color in the palette from the stylesheet as well

Browse Source 
The color should be used across the board, so the PlaceholderText color
should also be respecting the one passed for Text and so on.

Fixes: QTBUG-89815
Pick-to: 6.0 5.15
Change-Id: I2accb3db35488f95a1c8ebacf2316a08ee416fac
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Andy Shaw 2021-01-05 15:42:48 +01:00
parent 8c395a20ed
commit bb00b63dee
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -1473,6 +1473,7 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
p->setBrush(cg, w->foregroundRole(), pal->foreground);
p->setBrush(cg, QPalette::WindowText, pal->foreground);
p->setBrush(cg, QPalette::Text, pal->foreground);
p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
}
if (pal->selectionBackground.style() != Qt::NoBrush)
p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);

16
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
View File

@ -124,6 +124,7 @@ private slots:
void QTBUG15910_crashNullWidget();
void QTBUG36933_brokenPseudoClassLookup();
void styleSheetChangeBeforePolish();
void placeholderColor();
//at the end because it mess with the style.
void widgetStyle();
void appStyle();
@ -2222,6 +2223,21 @@ void tst_QStyleSheetStyle::highdpiImages()
QHighDpiScaling::updateHighDpiScaling(); // reset to normal
}
void tst_QStyleSheetStyle::placeholderColor()
{
const QColor red(Qt::red);
qApp->setStyleSheet("* { color: red; }");
QLineEdit le1;
QLineEdit le2;
le2.setEnabled(false);
le1.ensurePolished();
QCOMPARE(le1.palette().placeholderText(), red);
le2.ensurePolished();
QCOMPARE(le2.palette().placeholderText(), red);
le2.setEnabled(true);
QCOMPARE(le2.palette().placeholderText(), red);
}
QTEST_MAIN(tst_QStyleSheetStyle)
#include "tst_qstylesheetstyle.moc"