Default: use palette.windowText

Make use of the "windowText" color role for those controls that draw
text against the window background.

Task-number: QTBUG-63331
Change-Id: If4ea4176caf9dab79dd3a6997f3edbcaed7e789b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

7 files changed, 10 insertions, 8 deletions

diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 0920653e..9ae4f8f6 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -64,11 +64,10 @@ T.CheckBox {
 
         text: control.text
         font: control.font
-        color: control.down ? Default.textDarkColor : Default.textColor
+        color: control.palette.windowText
         elide: Text.ElideRight
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        opacity: enabled ? 1 : 0.3
     }
 }
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index a5b6b7d5..df58e85c 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -60,7 +60,7 @@ T.GroupBox {
 
         text: control.title
         font: control.font
-        color: control.enabled ? Default.textColor : Default.textDisabledColor
+        color: control.palette.windowText
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 7b7d56bc..ba68d605 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -42,6 +42,6 @@ import QtQuick.Templates 2.3 as T
 T.Label {
     id: control
 
-    color: Default.textDarkColor
+    color: control.palette.windowText
     linkColor: Default.textLinkColor
 }
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index c554ac11..38ccb91a 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -70,7 +70,7 @@ T.MenuItem {
         icon: control.icon
         text: control.text
         font: control.font
-        color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
+        color: control.palette.windowText
     }
 
     indicator: ColorImage {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 3e3908be..c00360cf 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -64,11 +64,10 @@ T.RadioButton {
 
         text: control.text
         font: control.font
-        color: control.down ? Default.textDarkColor : Default.textColor
+        color: control.palette.windowText
         elide: Text.ElideRight
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        opacity: enabled ? 1 : 0.3
     }
 }
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index a098d3f6..2ff9c553 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -64,7 +64,7 @@ T.Switch {
 
         text: control.text
         font: control.font
-        color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
+        color: control.palette.windowText
         elide: Text.ElideRight
         visible: control.text
         horizontalAlignment: Text.AlignLeft
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index a1ac91eb..b6281ada 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -43,6 +43,10 @@ QQuickDefaultTheme::QQuickDefaultTheme()
 {
     systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637));
     systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2));
+
+    systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A));
+    systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF));
+
     systemPalette = resolvePalette(systemPalette);
 }