Default: replace remaining Default.focusColor with palette.highlight

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

15 files changed, 24 insertions, 32 deletions

diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 07f066b3..1dbcd3ed 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -77,9 +77,9 @@ T.Button {
         implicitHeight: 40
         visible: !control.flat || control.down || control.checked || control.highlighted
         color: control.checked || control.highlighted ?
-            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) :
+            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : control.palette.highlight) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)) :
             (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor))
-        border.color: Default.focusColor
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
     }
 }
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml
index 85f619ab..76fd185c 100644
--- a/src/imports/controls/CheckIndicator.qml
+++ b/src/imports/controls/CheckIndicator.qml
@@ -51,14 +51,14 @@ Rectangle {
         : Default.backgroundColor) : Default.disabledDarkColor
     border.width: control.visualFocus ? 2 : 1
     border.color: control.enabled ? (control.visualFocus
-        ? Default.focusColor
+        ? control.palette.highlight
         : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent"
     opacity: enabled ? 1 : 0.3
 
     ColorImage {
         x: (parent.width - width) / 2
         y: (parent.height - height) / 2
-        color: control.visualFocus ? Default.focusColor : undefined
+        color: control.visualFocus ? control.palette.highlight : undefined
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
         visible: control.checkState === Qt.Checked
     }
@@ -68,7 +68,7 @@ Rectangle {
         y: (parent.height - height) / 2
         width: 16
         height: 3
-        color: control.visualFocus ? Default.focusColor : Default.frameDarkColor
+        color: control.visualFocus ? control.palette.highlight : Default.frameDarkColor
         visible: control.checkState === Qt.PartiallyChecked
     }
 }
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 28f78fb6..289c321f 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -64,7 +64,7 @@ T.ComboBox {
     indicator: ColorImage {
         x: control.mirrored ? control.padding : control.width - width - control.padding
         y: control.topPadding + (control.availableHeight - height) / 2
-        color: !control.editable && control.visualFocus ? Default.focusColor : undefined
+        color: !control.editable && control.visualFocus ? control.palette.highlight : undefined
         source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
@@ -84,7 +84,7 @@ T.ComboBox {
         validator: control.validator
 
         font: control.font
-        color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text
+        color: !control.editable && control.visualFocus ? control.palette.highlight : control.palette.text
         selectionColor: control.palette.highlight
         selectedTextColor: control.palette.highlightedText
         horizontalAlignment: Text.AlignLeft
@@ -93,7 +93,7 @@ T.ComboBox {
         background: Rectangle {
             visible: control.editable && !control.flat
             border.width: parent && parent.activeFocus ? 2 : 1
-            border.color: parent && parent.activeFocus ? Default.focusColor : Default.buttonColor
+            border.color: parent && parent.activeFocus ? control.palette.highlight : Default.buttonColor
         }
     }
 
@@ -103,7 +103,7 @@ T.ComboBox {
 
         color: !control.editable && control.visualFocus ? (control.pressed ? Default.focusPressedColor : Default.focusLightColor) :
             (control.down || popup.visible ? Default.buttonPressedColor : Default.buttonColor)
-        border.color: Default.focusColor
+        border.color: control.palette.highlight
         border.width: !control.editable && control.visualFocus ? 2 : 0
         visible: !control.flat || control.down
     }
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml
index ac1def81..bfbd2f08 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/DelayButton.qml
@@ -114,13 +114,13 @@ T.DelayButton {
         implicitWidth: 100
         implicitHeight: 40
         color: control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor)
-        border.color: Default.focusColor
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
 
         Rectangle {
             width: control.progress * parent.width
             height: parent.height
-            color: control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)
+            color: control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : control.palette.highlight) : (control.down ? Default.buttonCheckedPressedColor : Default.textColor)
         }
     }
 }
diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml
index 5997776a..c8130806 100644
--- a/src/imports/controls/RadioIndicator.qml
+++ b/src/imports/controls/RadioIndicator.qml
@@ -47,7 +47,7 @@ Rectangle {
         ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
         : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)
     border.width: control.visualFocus ? 2 : 1
-    border.color: control.visualFocus ? Default.focusColor : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)
+    border.color: control.visualFocus ? control.palette.highlight : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)
     opacity: enabled ? 1 : 0.3
 
     property Item control
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index 0f7c2f4c..3fbc9018 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -59,7 +59,7 @@ T.RangeSlider {
         radius: width / 2
         border.width: activeFocus ? 2 : 1
         border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
+            ? control.palette.highlight
             : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
         color: control.enabled ? (first.pressed
             ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
@@ -74,7 +74,7 @@ T.RangeSlider {
         radius: width / 2
         border.width: activeFocus ? 2 : 1
         border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
+            ? control.palette.highlight
             : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
         color: control.enabled ? (second.pressed
             ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml
index 11e8cf27..0704bf01 100644
--- a/src/imports/controls/RoundButton.qml
+++ b/src/imports/controls/RoundButton.qml
@@ -77,9 +77,9 @@ T.RoundButton {
         opacity: enabled ? 1 : 0.3
         visible: !control.flat || control.down || control.checked || control.highlighted
         color: control.checked || control.highlighted ?
-            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : Default.focusColor) : (control.down ? Default.buttonCheckedPressedColor : Default.buttonCheckedColor)) :
+            (control.visualFocus ? (control.down ? Default.buttonCheckedFocusColor : control.palette.highlight) : (control.down ? Default.buttonCheckedPressedColor : Default.buttonCheckedColor)) :
             (control.visualFocus ? (control.down ? Default.focusPressedColor : Default.focusLightColor) : (control.down ? Default.buttonPressedColor : Default.buttonColor))
-        border.color: Default.focusColor
+        border.color: control.palette.highlight
         border.width: control.visualFocus ? 2 : 0
     }
 }
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index ddf6267a..9f6bfe0a 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -60,7 +60,7 @@ T.Slider {
             : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
         border.width: control.visualFocus ? 2 : 1
         border.color: control.enabled ? (control.visualFocus
-            ? Default.focusColor
+            ? control.palette.highlight
             : (control.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
     }
 
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index e2d6591d..56cee139 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -84,7 +84,7 @@ T.SpinBox {
             height: control.height
             visible: control.activeFocus
             color: "transparent"
-            border.color: Default.focusColor
+            border.color: control.palette.highlight
             border.width: 2
         }
     }
diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml
index 7702a547..c8bfc9b9 100644
--- a/src/imports/controls/SwitchIndicator.qml
+++ b/src/imports/controls/SwitchIndicator.qml
@@ -49,9 +49,9 @@ Item {
         width: 56
         height: 16
         radius: 8
-        color: control.checked ? (control.visualFocus ? Default.focusColor : Default.buttonCheckedColor) : Default.buttonColor
+        color: control.checked ? (control.visualFocus ? control.palette.highlight : Default.buttonCheckedColor) : Default.buttonColor
         border.width: control.visualFocus ? 2 : 0
-        border.color: Default.focusColor
+        border.color: control.palette.highlight
     }
 
     Rectangle {
@@ -65,7 +65,7 @@ Item {
             : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
         border.width: control.visualFocus ? 2 : 1
         border.color: control.enabled ? (control.visualFocus
-            ? Default.focusColor
+            ? control.palette.highlight
             : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
 
         Behavior on x {
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 0c06c720..e9cfad39 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -77,6 +77,6 @@ T.TextField {
         implicitHeight: 40
         border.width: control.activeFocus ? 2 : 1
         color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor
-        border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent")
+        border.color: control.activeFocus ? control.palette.highlight : (control.enabled ? Default.disabledLightColor : "transparent")
     }
 }
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 1240e087..67233868 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -53,7 +53,7 @@ T.ToolButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? (visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
+    icon.color: enabled ? (visualFocus ? control.palette.highlight : Default.textDarkColor) : Default.textDisabledLightColor
 
     contentItem: IconLabel {
         spacing: control.spacing
@@ -63,7 +63,7 @@ T.ToolButton {
         icon: control.icon
         text: control.text
         font: control.font
-        color: control.enabled ? (control.visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
+        color: control.enabled ? (control.visualFocus ? control.palette.highlight : Default.textDarkColor) : Default.textDisabledLightColor
     }
 
     background: Rectangle {
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index a0149218..eba8e74e 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -75,7 +75,6 @@ Module {
         Property { name: "textLightColor"; 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 }
         Property { name: "focusLightColor"; type: "QColor"; isReadonly: true }
         Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true }
         Property { name: "buttonColor"; type: "QColor"; isReadonly: true }
diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp
index c3605bc5..a1b608dc 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/qquickdefaultstyle.cpp
@@ -78,11 +78,6 @@ QColor QQuickDefaultStyle::textPlaceholderColor() const
     return QColor::fromRgba(0xFF777777);
 }
 
-QColor QQuickDefaultStyle::focusColor() const
-{
-    return QColor::fromRgba(0xFF0066FF);
-}
-
 QColor QQuickDefaultStyle::focusLightColor() const
 {
     return QColor::fromRgba(0xFFF0F6FF);
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h
index 7972b1ef..27d7c7c7 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/qquickdefaultstyle_p.h
@@ -63,7 +63,6 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL)
-    Q_PROPERTY(QColor focusColor READ focusColor CONSTANT FINAL)
     Q_PROPERTY(QColor focusLightColor READ focusLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor focusPressedColor READ focusPressedColor CONSTANT FINAL)
     Q_PROPERTY(QColor buttonColor READ buttonColor CONSTANT FINAL)
@@ -102,7 +101,6 @@ public:
     QColor textDisabledColor() const;
     QColor textDisabledLightColor() const;
     QColor textPlaceholderColor() const;
-    QColor focusColor() const;
     QColor focusLightColor() const;
     QColor focusPressedColor() const;
     QColor buttonColor() const;