From 52ff67c1eb45617cd265e4672be6086b30d359a2 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 15 Feb 2022 16:09:18 +0100
Subject: [PATCH] Use separate context menu size for menus

Instead of re-using the setting controls. It's not a setting.

Contributes to issue CURA-8688.
---
 resources/qml/Widgets/Menu.qml         | 6 +++---
 resources/qml/Widgets/MenuItem.qml     | 2 +-
 resources/themes/cura-light/theme.json | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml
index 1a6aeff602..8fa326598a 100644
--- a/resources/qml/Widgets/Menu.qml
+++ b/resources/qml/Widgets/Menu.qml
@@ -14,12 +14,12 @@ UM.Menu
     id: menu
     padding: 0
 
-    implicitWidth: UM.Theme.getSize("setting_control").width
+    width: UM.Theme.getSize("context_menu").width
 
     delegate: Cura.MenuItem {}
     background: Rectangle
     {
-        color: UM.Theme.getColor("setting_control")
-        border.color: UM.Theme.getColor("setting_control_border")
+        color: UM.Theme.getColor("main_background")
+        border.color: UM.Theme.getColor("lining")
     }
 }
\ No newline at end of file
diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml
index 201fd480ce..f58f27fb8f 100644
--- a/resources/qml/Widgets/MenuItem.qml
+++ b/resources/qml/Widgets/MenuItem.qml
@@ -13,7 +13,7 @@ UM.MenuItem
 {
     id: menuItem
 
-    implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height
+    height: UM.Theme.getSize("context_menu").height
     opacity: enabled ? 1.0 : 0.5
 
     arrow: UM.RecolorImage
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index f59231d960..482c02d2f3 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -573,6 +573,8 @@
         "medium_button": [2.5, 2.5],
         "medium_button_icon": [2, 2],
 
+        "context_menu": [20, 2],
+
         "favorites_row": [2, 2],
         "favorites_button": [2, 2],
         "favorites_button_icon": [1.2, 1.2],