summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-10 13:32:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-11 19:02:31 +0000
commite5946f7b18f52d184b44ff62f3117ef760506122 (patch)
tree2385fa336b9b70c83d892ea9021e2f9e642ef223 /src/plugins
parent029a1c532981897c0361a9ffcd88fa1329b4584b (diff)
Windows QPA/Vista style: Fix placeholder color
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>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/windows/qwindowstheme.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
index 0c778ecd24..61a885953a 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@@ -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);