diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-21 10:11:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-22 11:20:27 +0000 |
| commit | 188b5e2a02926b6f1b43793f0bc1f6435bb949c4 (patch) | |
| tree | 35d358ba9b0757f3065963af5cc9b60c31da0b1f /src/imports/controls/qquickdefaulttheme.cpp | |
| parent | 72d9c1bfb7f814163880386584cc6edde9158713 (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qquickdefaulttheme.cpp')
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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 |