diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-01 14:55:24 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-22 19:53:17 +0000 |
commit | def3d26a97c879e00cae76bbe3133f35628479c3 (patch) | |
tree | f1b455e9eb95553e6bcb692798b5e7246ea3c9bf | |
parent | 4001fae588de105b18aa17e1df9364c0f1239053 (diff) |
Default: make ProgressBar use palettes
Task-number: QTBUG-63369
Change-Id: Icf2204f9395798ccdca2448a26e0a2c9c4826a33
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/imports/controls/ProgressBar.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/plugins.qmltypes | 1 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaultstyle.cpp | 5 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaultstyle_p.h | 2 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 0d8716f7..24f4477a 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -53,7 +53,7 @@ T.ProgressBar { scale: control.mirrored ? -1 : 1 progress: control.position indeterminate: control.visible && control.indeterminate - color: Default.textColor + color: control.palette.dark } background: Rectangle { @@ -64,6 +64,6 @@ T.ProgressBar { width: control.availableWidth height: 6 - color: Default.progressBarColor + color: control.palette.light } } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index c4539083..7ab54182 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -101,7 +101,6 @@ Module { Property { name: "frameLightColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true } - Property { name: "progressBarColor"; type: "QColor"; isReadonly: true } Property { name: "pageIndicatorColor"; type: "QColor"; isReadonly: true } Property { name: "separatorColor"; type: "QColor"; isReadonly: true } Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index bc5f5d93..93285b18 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -208,11 +208,6 @@ QColor QQuickDefaultStyle::scrollBarPressedColor() const return QColor::fromRgba(0xFF28282A); } -QColor QQuickDefaultStyle::progressBarColor() const -{ - return QColor::fromRgba(0xFFE4E4E4); -} - QColor QQuickDefaultStyle::pageIndicatorColor() const { return QColor::fromRgba(0xFF28282A); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index b43b8643..65705e61 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -89,7 +89,6 @@ class QQuickDefaultStyle : public QObject Q_PROPERTY(QColor frameLightColor READ frameLightColor CONSTANT FINAL) Q_PROPERTY(QColor scrollBarColor READ scrollBarColor CONSTANT FINAL) Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor CONSTANT FINAL) - Q_PROPERTY(QColor progressBarColor READ progressBarColor CONSTANT FINAL) Q_PROPERTY(QColor pageIndicatorColor READ pageIndicatorColor CONSTANT FINAL) Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL) Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL) @@ -133,7 +132,6 @@ public: QColor frameLightColor() const; QColor scrollBarColor() const; QColor scrollBarPressedColor() const; - QColor progressBarColor() const; QColor pageIndicatorColor() const; QColor separatorColor() const; QColor disabledDarkColor() const; diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 93ed2a90..60d76556 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -54,6 +54,8 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF)); + systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFE4E4E4)); + systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); |