1 files changed, 21 insertions, 20 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
index 92de52b44f..16a76c2e64 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
@@ -1,15 +1,17 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Templates 2.15 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Templates as T
 import StudioTheme 1.0 as StudioTheme
 
 T.MenuItem {
     id: control
 
-    property int labelSpacing: StudioTheme.Values.contextMenuLabelSpacing
+    property StudioTheme.ControlStyle style: StudioTheme.Values.controlStyle
+
+    property int labelSpacing: control.style.contextMenuLabelSpacing
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
@@ -19,7 +21,7 @@ T.MenuItem {
 
     padding: 0
     spacing: 0
-    horizontalPadding: StudioTheme.Values.contextMenuHorizontalPadding
+    horizontalPadding: control.style.contextMenuHorizontalPadding
     action: Action {}
 
     contentItem: Item {
@@ -27,8 +29,9 @@ T.MenuItem {
             id: textLabel
             text: control.text
             font: control.font
-            color: control.enabled ? StudioTheme.Values.themeTextColor
-                                   : StudioTheme.Values.themeTextColorDisabled
+            color: control.enabled ? control.highlighted ? control.style.text.selectedText
+                                                         : control.style.text.idle
+                                    : control.style.text.disabled
             anchors.verticalCenter: parent.verticalCenter
         }
 
@@ -42,19 +45,19 @@ T.MenuItem {
 
             Shortcut {
                 id: shortcut
-                property int shortcutWorkaround: control.action.shortcut ? control.action.shortcut : 0
-                sequence: shortcutWorkaround
+                property int shortcutWorkaround: control.action.shortcut ?? 0
+                sequence: shortcut.shortcutWorkaround
             }
         }
     }
 
     arrow: T.Label {
         id: arrow
-        x: parent.width - (StudioTheme.Values.height + arrow.width) / 2
+        x: parent.width - (control.style.controlSize.height + arrow.width) / 2
         y: (parent.height - arrow.height) / 2
         visible: control.subMenu
         text: StudioTheme.Constants.startNode
-        color: StudioTheme.Values.themeTextColor
+        color: control.style.icon.idle
         font.pixelSize: 8
         font.family: StudioTheme.Constants.iconFont.family
     }
@@ -62,13 +65,11 @@ T.MenuItem {
     background: Rectangle {
         implicitWidth: textLabel.implicitWidth + control.labelSpacing + shortcutLabel.implicitWidth
                        + control.leftPadding + control.rightPadding
-        implicitHeight: StudioTheme.Values.height
-        x: StudioTheme.Values.border
-        y: StudioTheme.Values.border
-        width: control.menu.width - (StudioTheme.Values.border * 2)
-        height: control.height - (StudioTheme.Values.border * 2)
-        color: control.down ? control.palette.midlight
-                            : control.highlighted ? StudioTheme.Values.themeInteraction
-                                                  : "transparent"
+        implicitHeight: control.style.controlSize.height
+        x: control.style.borderWidth
+        y: control.style.borderWidth
+        width: (control.menu?.width ?? 0) - (control.style.borderWidth * 2)
+        height: control.height - (control.style.borderWidth * 2)
+        color: control.highlighted ? control.style.interaction : "transparent"
     }
 }