diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 16:56:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 07:38:50 +0000 |
| commit | 203385b1a07248b0bf2c9b7025c8d337fd5e17b6 (patch) | |
| tree | 0cbd3477c07b0d941146c2ba967f6492b67536ae /src/imports | |
| parent | b914b06c8996a8266abc809e1e58b30eedbeb0f7 (diff) | |
Default: make panes and frames use palettes
Task-number: QTBUG-63369
Change-Id: I14cdbef627c4c689d6e0009de1d5dc04515c9c17
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/Frame.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/GroupBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/Pane.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index e3c84d3c..9b81b7be 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -52,6 +52,6 @@ T.Frame { background: Rectangle { color: "transparent" - border.color: Default.frameLightColor + border.color: control.palette.mid } } diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index df58e85c..967f591d 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -72,6 +72,6 @@ T.GroupBox { height: parent.height - control.topPadding + control.padding color: "transparent" - border.color: Default.frameLightColor + border.color: control.palette.mid } } diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml index 19dfb530..ac023bdd 100644 --- a/src/imports/controls/Pane.qml +++ b/src/imports/controls/Pane.qml @@ -51,6 +51,6 @@ T.Pane { padding: 12 background: Rectangle { - color: Default.backgroundColor + color: control.palette.window } } diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 517e6077..6caf651a 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -58,6 +58,8 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); + systemPalette.setColor(QPalette::Mid, QColor::fromRgba(0xFFBDBDBD)); + systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); |