diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 19:14:13 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 06:55:36 +0000 |
| commit | 6d4bf43cb7c8c08885cc6ca2cb1ccdfb5ec8aa4b (patch) | |
| tree | bdc8169cea607cdf8ab3bd02365e4b84ef574e7e /src | |
| parent | f995bcf4020bf9a20d2f13821a5e55e02381e5fb (diff) | |
Default: make MenuItem use palettes
Task-number: QTBUG-63369
Change-Id: Ic9e516f656d4115a0546f12e1fde46d4932c2901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/MenuBarItem.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/MenuItem.qml | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml index dd2bc372..c18b1174 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: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.windowText contentItem: IconLabel { spacing: control.spacing @@ -67,12 +67,12 @@ T.MenuBarItem { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.windowText } background: Rectangle { implicitWidth: 40 implicitHeight: 40 - color: control.highlighted || control.down ? Default.delegatePressedColor : "transparent" + color: control.highlighted || control.down ? control.palette.light : "transparent" } } diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 38ccb91a..751b33f6 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -54,7 +54,7 @@ T.MenuItem { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.windowText contentItem: IconLabel { readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0 @@ -79,7 +79,8 @@ T.MenuItem { visible: control.checked source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : "" - color: control.enabled ? undefined : Default.textDisabledColor + color: control.palette.windowText + defaultColor: "#353637" } arrow: ColorImage { @@ -89,7 +90,8 @@ T.MenuItem { visible: control.subMenu mirror: control.mirrored source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : "" - color: control.enabled ? undefined : Default.textDisabledColor + color: control.palette.windowText + defaultColor: "#353637" } background: Item { @@ -101,7 +103,7 @@ T.MenuItem { y: 1 width: parent.width - 2 height: parent.height - 2 - color: control.highlighted || control.down ? Default.delegateColor : "transparent" + color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" } } } |