diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 16:58:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 07:39:02 +0000 |
| commit | f11be4cf355c89dc4afc05159f7ebb6674191cd3 (patch) | |
| tree | 7a26fd0742183d29b91bdb002b79c42bb24f4830 /src | |
| parent | 203385b1a07248b0bf2c9b7025c8d337fd5e17b6 (diff) | |
Default: make separators use palettes
Not the exact same color it was before, but it is now the same color
Frame uses.
Task-number: QTBUG-63369
Change-Id: I5b850d85d756d03b2502a8f56e972ed7ff5959a9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/MenuSeparator.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/ToolSeparator.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 |
5 files changed, 2 insertions, 10 deletions
diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml index e296153e..db34e746 100644 --- a/src/imports/controls/MenuSeparator.qml +++ b/src/imports/controls/MenuSeparator.qml @@ -52,6 +52,6 @@ T.MenuSeparator { contentItem: Rectangle { implicitWidth: 188 implicitHeight: 1 - color: Default.separatorColor + color: control.palette.mid } } diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml index 902fae82..1a99953d 100644 --- a/src/imports/controls/ToolSeparator.qml +++ b/src/imports/controls/ToolSeparator.qml @@ -52,6 +52,6 @@ T.ToolSeparator { contentItem: Rectangle { implicitWidth: vertical ? 1 : 30 implicitHeight: vertical ? 30 : 1 - color: Default.separatorColor + color: control.palette.mid } } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index b488125a..a0149218 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -99,7 +99,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: "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 727df986..c3605bc5 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -198,11 +198,6 @@ QColor QQuickDefaultStyle::scrollBarPressedColor() const return QColor::fromRgba(0xFF28282A); } -QColor QQuickDefaultStyle::separatorColor() const -{ - return QColor::fromRgba(0xFFCCCCCC); -} - QColor QQuickDefaultStyle::disabledDarkColor() const { return QColor::fromRgba(0xFF353637); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index b96a319e..7972b1ef 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -87,7 +87,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 separatorColor READ separatorColor CONSTANT FINAL) Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL) Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL) @@ -127,7 +126,6 @@ public: QColor frameLightColor() const; QColor scrollBarColor() const; QColor scrollBarPressedColor() const; - QColor separatorColor() const; QColor disabledDarkColor() const; QColor disabledLightColor() const; }; |