diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 21:23:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 06:55:42 +0000 |
| commit | e1cda895956cd69d1b9d4654dcccc476fc8db93d (patch) | |
| tree | 752b31c525d18bac7605a4ea32b7774cb8a0adb2 /src | |
| parent | ba745c1da2105b4bdd2c57be1d8a692776e6b768 (diff) | |
Default: make MenuBar & MenuBarItem use palettes
Task-number: QTBUG-63369
Change-Id: I61cc75166df05933782c24109e845411ef2aff0b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/MenuBar.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/MenuBarItem.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/MenuBar.qml index 4a1c63b7..4c205465 100644 --- a/src/imports/controls/MenuBar.qml +++ b/src/imports/controls/MenuBar.qml @@ -58,6 +58,6 @@ T.MenuBar { background: Rectangle { implicitHeight: 40 - color: Default.delegateColor + color: control.palette.button } } diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml index c18b1174..dfe20788 100644 --- a/src/imports/controls/MenuBarItem.qml +++ b/src/imports/controls/MenuBarItem.qml @@ -56,7 +56,7 @@ T.MenuBarItem { icon.width: 24 icon.height: 24 - icon.color: control.palette.windowText + icon.color: control.palette.buttonText contentItem: IconLabel { spacing: control.spacing @@ -67,12 +67,12 @@ T.MenuBarItem { icon: control.icon text: control.text font: control.font - color: control.palette.windowText + color: control.palette.buttonText } background: Rectangle { implicitWidth: 40 implicitHeight: 40 - color: control.highlighted || control.down ? control.palette.light : "transparent" + color: control.down || control.highlighted ? control.palette.mid : "transparent" } } diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 93d29e15..a547b7ce 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -44,6 +44,8 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::Base, QColor::fromRgba(0xFFFFFFFF)); systemPalette.setColor(QPalette::Disabled, QPalette::Base, QColor::fromRgba(0xFFD6D6D6)); + systemPalette.setColor(QPalette::Button, QColor::fromRgba(0xFFE0E0E0)); + systemPalette.setColor(QPalette::ButtonText, QColor::fromRgba(0xFF26282A)); systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgba(0x4D26282A)); |