From 2bdf059e6e62fda8e1df108f0a68651e546b0f67 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 8 Sep 2016 10:29:57 +0200 Subject: Default: consolidate style colors into a singleton This reduces all of the duplicate literals that we currently have. Task-number: QTBUG-55867 Change-Id: I28f1f646d25f2f6578d52b4ba96f8f0f3ad6706b Reviewed-by: J-P Nurmi --- src/imports/controls/CheckIndicator.qml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/imports/controls/CheckIndicator.qml') diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index d78e9e30..7f3e7e6f 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -35,6 +35,8 @@ ****************************************************************************/ import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.impl 2.1 Rectangle { id: indicator @@ -44,14 +46,18 @@ Rectangle { implicitWidth: 28 implicitHeight: 28 - color: control.enabled ? (control.down ? (control.visualFocus ? "#cce0ff" : "#f6f6f6") : "#ffffff") : "#353637" + color: control.enabled ? (control.down + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : Default.backgroundColor) : Default.disabledDarkColor border.width: control.visualFocus ? 2 : 1 - border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.down ? "#808080" : "#909090")) : "transparent" + border.color: control.enabled ? (control.visualFocus + ? Default.focusColor + : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent" Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - source: "image://default/check/" + (control.visualFocus ? "#0066ff" : "#353637") + source: "image://default/check/" + (control.visualFocus ? Default.focusColor : Default.textColor) sourceSize.width: width sourceSize.height: height visible: control.checkState === Qt.Checked @@ -62,7 +68,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 3 - color: control.visualFocus ? "#0066ff" : "#353637" + color: control.visualFocus ? Default.focusColor : Default.frameDarkColor visible: control.checkState === Qt.PartiallyChecked } } -- cgit v1.2.3