aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-06-21 19:18:58 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-06-22 11:36:58 +0000
commit6d9d5d41151e790f26ba59bd88d6515485326a57 (patch)
treebf6591c01af501d410331f83e2ab05839b63f159
parent228b4401308275d3729745682b11ae0de9c3fa46 (diff)
Default: fix disabled state for the MenuItem indicators
The check indicator and the sub-menu arrow were black when disabled. Change-Id: I7042535765eabc7651bbc5d7f15f901cd40ebeb6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/MenuItem.qml6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index e0532719..225f9310 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -73,21 +73,23 @@ T.MenuItem {
color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
}
- indicator: Image {
+ indicator: ColorImage {
x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
y: control.topPadding + (control.availableHeight - height) / 2
visible: control.checked
source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : ""
+ color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
}
- arrow: Image {
+ arrow: ColorImage {
x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
y: control.topPadding + (control.availableHeight - height) / 2
visible: control.subMenu
mirror: control.mirrored
source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : ""
+ color: control.enabled ? Default.textDarkColor : Default.textDisabledColor
}
background: Item {