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

Windows QPA/Vista style: Fix placeholder color

Browse Source 
Bring back the code that was removed by
62c3dd5632b04a7ee2410cc2233c0d0605ad5bd6 to the Windows theme.

Fixes: QTBUG-93635
Change-Id: I066e89d482a584c1719f6bfb6160710ee73e1b81
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
(cherry picked from commit 26638dfe3be009e886d5fc0b2ffa1879efee56b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2021-05-10 13:32:35 +02:00 committed by Qt Cherry-pick Bot
parent 029a1c5329
commit e5946f7b18
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -269,6 +269,12 @@ static inline QPalette standardPalette()
return palette;
}
static QColor placeHolderColor(QColor textColor)
{
textColor.setAlpha(128);
return textColor;
}
static void populateLightSystemBasePalette(QPalette &result)
{
result.setColor(QPalette::WindowText, getSysColor(COLOR_WINDOWTEXT));
@ -278,7 +284,9 @@ static void populateLightSystemBasePalette(QPalette &result)
result.setColor(QPalette::Light, btnHighlight);
result.setColor(QPalette::Dark, getSysColor(COLOR_BTNSHADOW));
result.setColor(QPalette::Mid, result.button().color().darker(150));
result.setColor(QPalette::Text, getSysColor(COLOR_WINDOWTEXT));
const QColor textColor = getSysColor(COLOR_WINDOWTEXT);
result.setColor(QPalette::Text, textColor);
result.setColor(QPalette::PlaceholderText, placeHolderColor(textColor));
result.setColor(QPalette::BrightText, btnHighlight);
result.setColor(QPalette::Base, getSysColor(COLOR_WINDOW));
result.setColor(QPalette::Window, btnFace);
@ -300,6 +308,7 @@ static void populateDarkSystemBasePalette(QPalette &result)
result.setColor(QPalette::Dark, QColor(darkModeBtnShadowRgb));
result.setColor(QPalette::Mid, result.button().color().darker(150));
result.setColor(QPalette::Text, darkModeWindowText);
result.setColor(QPalette::PlaceholderText, placeHolderColor(darkModeWindowText));
result.setColor(QPalette::BrightText, btnHighlight);
result.setColor(QPalette::Base, darkModebtnFace);
result.setColor(QPalette::Window, darkModebtnFace);