From 6d4bf43cb7c8c08885cc6ca2cb1ccdfb5ec8aa4b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Tue, 26 Sep 2017 19:14:13 +0200
Subject: Default: make MenuItem use palettes

Task-number: QTBUG-63369
Change-Id: Ic9e516f656d4115a0546f12e1fde46d4932c2901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/MenuBarItem.qml |  6 +++---
 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"
         }
     }
 }
-- 
cgit v1.2.3