diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-01 15:09:29 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-22 19:53:25 +0000 |
| commit | bf1df7beae8e3ebd2c0b529265bad52703fe8ac8 (patch) | |
| tree | 26c572c7507c4d467f726cae1ee7bc03afe80dfb /src | |
| parent | def3d26a97c879e00cae76bbe3133f35628479c3 (diff) | |
Default: make PageIndicator use palettes
Task-number: QTBUG-63369
Change-Id: I545b267cb69b4fd76e42c17d436362ee4e06c45a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/PageIndicator.qml | 2 | ||||
| -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 |
4 files changed, 1 insertions, 9 deletions
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 19d704c1..a0b1e17a 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -55,7 +55,7 @@ T.PageIndicator { implicitHeight: 8 radius: width / 2 - color: Default.pageIndicatorColor + color: control.palette.dark opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 Behavior on opacity { OpacityAnimator { duration: 100 } } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index 7ab54182..d5bdfefe 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: "pageIndicatorColor"; type: "QColor"; isReadonly: true } Property { name: "separatorColor"; type: "QColor"; isReadonly: true } Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true } Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index 93285b18..3f91eb58 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::pageIndicatorColor() const -{ - return QColor::fromRgba(0xFF28282A); -} - QColor QQuickDefaultStyle::separatorColor() const { return QColor::fromRgba(0xFFCCCCCC); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index 65705e61..e2f9bf4a 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 pageIndicatorColor READ pageIndicatorColor CONSTANT FINAL) Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL) Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL) Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL) @@ -132,7 +131,6 @@ public: QColor frameLightColor() const; QColor scrollBarColor() const; QColor scrollBarPressedColor() const; - QColor pageIndicatorColor() const; QColor separatorColor() const; QColor disabledDarkColor() const; QColor disabledLightColor() const; |