diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 16:28:10 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 06:55:27 +0000 |
| commit | 95cf81482518b84c4f013f7606557e0234b21a8e (patch) | |
| tree | bfcd3e816d20cc5d0553898cc3c9cd11cc7a508b /src/imports/controls/CheckIndicator.qml | |
| parent | d518d61006c55679f61add2130a7575dc68e61b5 (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/CheckIndicator.qml')
| -rw-r--r-- | src/imports/controls/CheckIndicator.qml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index 76fd185c..730878be 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -46,19 +46,15 @@ Rectangle { implicitWidth: 28 implicitHeight: 28 - color: control.enabled ? (control.down - ? (control.visualFocus ? Default.focusPressedColor : Default.indicatorPressedColor) - : Default.backgroundColor) : Default.disabledDarkColor + color: control.down ? control.palette.light : control.palette.base border.width: control.visualFocus ? 2 : 1 - border.color: control.enabled ? (control.visualFocus - ? control.palette.highlight - : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent" - opacity: enabled ? 1 : 0.3 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid ColorImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - color: control.visualFocus ? control.palette.highlight : undefined + defaultColor: "#353637" + color: control.palette.text source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" visible: control.checkState === Qt.Checked } @@ -68,7 +64,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 3 - color: control.visualFocus ? control.palette.highlight : Default.frameDarkColor + color: control.palette.text visible: control.checkState === Qt.PartiallyChecked } } |