diff options
Diffstat (limited to 'src/imports/controls/CheckIndicator.qml')
| -rw-r--r-- | src/imports/controls/CheckIndicator.qml | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index 0be3e6cd..730878be 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 -import QtQuick.Controls.impl 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 Rectangle { id: indicator @@ -46,21 +46,16 @@ 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 - ? Default.focusColor - : (control.down ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : "transparent" - opacity: enabled ? 1 : 0.3 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - Image { + ColorImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - source: "image://default/check/" + (control.visualFocus ? Default.focusColor : Default.textColor) - sourceSize.width: width - sourceSize.height: height + defaultColor: "#353637" + color: control.palette.text + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" visible: control.checkState === Qt.Checked } @@ -69,7 +64,7 @@ Rectangle { y: (parent.height - height) / 2 width: 16 height: 3 - color: control.visualFocus ? Default.focusColor : Default.frameDarkColor + color: control.palette.text visible: control.checkState === Qt.PartiallyChecked } } |