From 95cf81482518b84c4f013f7606557e0234b21a8e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 26 Sep 2017 16:28:10 +0200 Subject: Default: make Check/RadioIndicator use palettes Task-number: QTBUG-63369 Change-Id: Iced34279af95caa62f097694c94c2ec34285f748 Reviewed-by: Mitch Curtis --- src/imports/controls/RadioIndicator.qml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/imports/controls/RadioIndicator.qml') 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 } } -- cgit v1.2.3