From 188b5e2a02926b6f1b43793f0bc1f6435bb949c4 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 21 Sep 2017 10:11:04 +0200 Subject: Default: use palette.text Make editors and delegates use the "text" color role from palettes. This color role is normally used as a foreground color for the "base" background color. Task-number: QTBUG-63331 Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b Reviewed-by: Mitch Curtis --- src/imports/controls/qquickdefaulttheme.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/imports/controls/qquickdefaulttheme.cpp') diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index f9cdcddc..a1ac91eb 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -41,6 +41,15 @@ QT_BEGIN_NAMESPACE QQuickDefaultTheme::QQuickDefaultTheme() : QQuickTheme(QStringLiteral("Default")) { + systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); + systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); + systemPalette = resolvePalette(systemPalette); +} + +const QPalette *QQuickDefaultTheme::palette(QPlatformTheme::Palette type) const +{ + Q_UNUSED(type); + return &systemPalette; } QT_END_NAMESPACE -- cgit v1.2.3