diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 09:51:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 12:37:00 +0000 |
| commit | 7b165203783efb4d59f0d68f14e8a211fef14d87 (patch) | |
| tree | 38d64e2ab0d8efac20c5c852f262355bbe4e9e1d /src/imports/controls/ComboBox.qml | |
| parent | a98b02635aee2317b9e1f2b93ed8c7f96243b237 (diff) | |
Default: replace remaining Default.focusColor with palette.highlight
Task-number: QTBUG-63369
Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 8 |
1 files changed, 4 insertions, 4 deletions
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 } |