From 3de824e1a47ddb4ae0fe1b837acdac075af4bccc Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 8 Apr 2022 14:58:39 +0200
Subject: [PATCH] Show submenu with material types

It's quite a hassle to get it to keep displaying...

Contributes to issue CURA-8640.
---
 resources/qml/Menus/MaterialBrandMenu.qml | 65 +++++++++++++++++++++--
 resources/qml/Menus/MaterialMenu.qml      |  2 +-
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml
index f6fcbe3039..c10c48d076 100644
--- a/resources/qml/Menus/MaterialBrandMenu.qml
+++ b/resources/qml/Menus/MaterialBrandMenu.qml
@@ -16,6 +16,9 @@ Cura.MenuItem
     id: materialBrandMenu
     overrideShowArrow: true
 
+    property var materialTypesModel
+    text: materialTypesModel.name
+
     contentItem: MouseArea
     {
         hoverEnabled: true
@@ -63,7 +66,7 @@ Cura.MenuItem
         function restartTimer()
         {
             restart();
-            running = materialBrandMenu.enabled && materialBrandMenu.contentItem.containsMouse;
+            running = Qt.binding(function() { return materialBrandMenu.enabled && materialBrandMenu.contentItem.containsMouse; });
             hideTimer.running = false;
         }
         onTriggered: menuPopup.open()
@@ -75,7 +78,7 @@ Cura.MenuItem
         function restartTimer() //Restart but re-evaluate the running property then.
         {
             restart();
-            running = materialBrandMenu.enabled && !materialBrandMenu.contentItem.containsMouse && !submenuArea.containsMouse;
+            running = Qt.binding(function() { return materialBrandMenu.enabled && !materialBrandMenu.contentItem.containsMouse && !menuPopup.itemHovered > 0; });
             showTimer.running = false;
         }
         onTriggered: menuPopup.close()
@@ -86,9 +89,14 @@ Cura.MenuItem
         id: menuPopup
         x: parent.width
         y: 0
-        width: 100
-        height: 100
+        width: materialTypesList.width + padding * 2
+        height: materialTypesList.height + padding * 2
 
+        padding: background.border.width
+        // Nasty hack to ensure that we can keep track if the popup contains the mouse.
+        // Since we also want a hover for the sub items (and these events are sent async)
+        // We have to keep a count of itemHovered (instead of just a bool)
+        property int itemHovered: 0
         MouseArea
         {
             id: submenuArea
@@ -97,5 +105,54 @@ Cura.MenuItem
             hoverEnabled: true
             onEntered: hideTimer.restartTimer()
         }
+
+        background: Rectangle
+        {
+            color: UM.Theme.getColor("main_background")
+            border.color: UM.Theme.getColor("lining")
+            border.width: UM.Theme.getSize("default_lining").width
+        }
+
+        Column
+        {
+            id: materialTypesList
+
+            Repeater
+            {
+                model: materialTypesModel.material_types
+
+                //Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered.
+                //With a custom MouseArea, we can prevent the events from being accepted.
+                delegate: Item
+                {
+                    width: materialTypeLabel.width
+                    height: materialTypeLabel.height
+
+                    Rectangle
+                    {
+                        width: materialTypesList.width
+                        height: parent.height
+
+                        color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
+
+                        MouseArea
+                        {
+                            id: materialTypeButton
+                            anchors.fill: parent
+                            hoverEnabled: true
+
+                            onEntered: menuPopup.itemHovered += 1
+                            onExited: menuPopup.itemHovered -= 1
+                        }
+                    }
+
+                    UM.Label
+                    {
+                        id: materialTypeLabel
+                        text: model.name
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index fd1236feb7..c4ae4113f9 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -100,7 +100,7 @@ Cura.Menu
         model: brandModel
         delegate: Cura.MaterialBrandMenu
         {
-            text: model.name
+            materialTypesModel: model
         }
         onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)}
         onObjectRemoved: function(object) { materialMenu.removeItem(index) }