Default: pick selection & selected text color from the palette

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

8 files changed, 10 insertions, 15 deletions

diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 9e9a53df..28f78fb6 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -85,8 +85,8 @@ T.ComboBox {
 
         font: control.font
         color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text
-        selectionColor: Default.focusColor
-        selectedTextColor: Default.textLightColor
+        selectionColor: control.palette.highlight
+        selectedTextColor: control.palette.highlightedText
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
 
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 33e0c51e..e2d6591d 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -68,8 +68,8 @@ T.SpinBox {
 
         font: control.font
         color: control.palette.text
-        selectionColor: Default.focusColor
-        selectedTextColor: Default.textLightColor
+        selectionColor: control.palette.highlight
+        selectedTextColor: control.palette.highlightedText
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: Qt.AlignVCenter
 
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 6e336947..1701b9fe 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -53,8 +53,8 @@ T.TextArea {
     leftPadding: padding + 4
 
     color: control.palette.text
-    selectionColor: Default.textSelectionColor
-    selectedTextColor: color
+    selectionColor: control.palette.highlight
+    selectedTextColor: control.palette.highlightedText
 
     PlaceholderText {
         id: placeholder
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index b8f8fb55..0c06c720 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -53,8 +53,8 @@ T.TextField {
     leftPadding: padding + 4
 
     color: control.palette.text
-    selectionColor: Default.textSelectionColor
-    selectedTextColor: color
+    selectionColor: control.palette.highlight
+    selectedTextColor: control.palette.highlightedText
     verticalAlignment: TextInput.AlignVCenter
 
     PlaceholderText {
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 85c137b2..c4539083 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -75,7 +75,6 @@ Module {
         Property { name: "textColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "textLightColor"; type: "QColor"; isReadonly: true }
-        Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusColor"; type: "QColor"; isReadonly: true }
diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp
index 994506f4..bc5f5d93 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/qquickdefaultstyle.cpp
@@ -73,11 +73,6 @@ QColor QQuickDefaultStyle::textLightColor() const
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::textSelectionColor() const
-{
-    return QColor::fromRgba(0xFFFDDD5C);
-}
-
 QColor QQuickDefaultStyle::textDisabledColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h
index e0931921..b43b8643 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/qquickdefaultstyle_p.h
@@ -62,7 +62,6 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor textColor READ textColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDarkColor READ textDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor textLightColor READ textLightColor CONSTANT FINAL)
-    Q_PROPERTY(QColor textSelectionColor READ textSelectionColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL)
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index 13d6fea2..c2ea2865 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -50,6 +50,8 @@ QQuickDefaultTheme::QQuickDefaultTheme()
     systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF));
     systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF));
 
+    systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF));
+
     systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7));
 
     systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637));