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 | |
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')
-rw-r--r-- | src/imports/controls/CheckIndicator.qml | 14 | ||||
-rw-r--r-- | src/imports/controls/ProgressBar.qml | 2 | ||||
-rw-r--r-- | src/imports/controls/RadioIndicator.qml | 9 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 6 |
4 files changed, 13 insertions, 18 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 } } diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 24f4477a..ff760099 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -64,6 +64,6 @@ T.ProgressBar { width: control.availableWidth height: 6 - color: control.palette.light + color: control.palette.midlight } } 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 } } diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 3e385707..93d29e15 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -57,14 +57,16 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF)); - systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFE4E4E4)); + systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFF6F6F6)); systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); systemPalette.setColor(QPalette::Mid, QColor::fromRgba(0xFFBDBDBD)); + systemPalette.setColor(QPalette::Midlight, QColor::fromRgba(0xFFE4E4E4)); + systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); - systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); + systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0x4D353637)); systemPalette.setColor(QPalette::Shadow, QColor::fromRgba(0xFF28282A)); |