aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/RadioIndicator.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-09-26 16:28:10 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-09-27 06:55:27 +0000
commit95cf81482518b84c4f013f7606557e0234b21a8e (patch)
treebfcd3e816d20cc5d0553898cc3c9cd11cc7a508b /src/imports/controls/RadioIndicator.qml
parentd518d61006c55679f61add2130a7575dc68e61b5 (diff)
Default: make Check/RadioIndicator use palettes
Task-number: QTBUG-63369 Change-Id: Iced34279af95caa62f097694c94c2ec34285f748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/RadioIndicator.qml')
-rw-r--r--src/imports/controls/RadioIndicator.qml9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml
index c8130806..e0d32047 100644
--- a/src/imports/controls/RadioIndicator.qml
+++ b/src/imports/controls/RadioIndicator.qml
@@ -43,12 +43,9 @@ Rectangle {
implicitHeight: 28
radius: width / 2
- color: control.down
- ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
- : (control.visualFocus ? Default.focusLightColor : Default.backgroundColor)
+ color: control.down ? control.palette.light : control.palette.base
border.width: control.visualFocus ? 2 : 1
- border.color: control.visualFocus ? control.palette.highlight : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)
- opacity: enabled ? 1 : 0.3
+ border.color: control.visualFocus ? control.palette.highlight : control.palette.mid
property Item control
@@ -58,7 +55,7 @@ Rectangle {
width: 20
height: 20
radius: width / 2
- color: control.down ? Default.textDarkColor : Default.buttonCheckedColor
+ color: control.palette.text
visible: control.checked
}
}