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/CheckIndicator.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/CheckIndicator.qml')
| -rw-r--r-- | src/imports/controls/CheckIndicator.qml | 6 |
1 files changed, 3 insertions, 3 deletions
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 } } |