diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-08 10:29:57 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-12 08:27:37 +0000 |
commit | 2bdf059e6e62fda8e1df108f0a68651e546b0f67 (patch) | |
tree | f7b3bdf8a5b61814b827217bf3ad66e8879cd670 /src/imports/controls/RadioIndicator.qml | |
parent | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (diff) |
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 <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/RadioIndicator.qml')
-rw-r--r-- | src/imports/controls/RadioIndicator.qml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml index 08c24cc5..7fb855d9 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/imports/controls/RadioIndicator.qml @@ -35,15 +35,19 @@ ****************************************************************************/ import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.impl 2.1 Rectangle { implicitWidth: 28 implicitHeight: 28 radius: width / 2 - color: control.down ? (control.visualFocus ? "#cce0ff" : "#f6f6f6") : (control.visualFocus ? "#f0f6ff" : "#ffffff") + color: control.down + ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) + : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor) border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? "#0066ff" : (control.down ? "#808080" : "#909090") + border.color: control.visualFocus ? Default.focusColor : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor) property Item control @@ -53,7 +57,7 @@ Rectangle { width: 20 height: 20 radius: width / 2 - color: control.down ? "#26282a" : "#353637" + color: control.down ? Default.textDarkColor : Default.buttonCheckedColor visible: control.checked } } |