From e532e13e06ac63517a757dab2c4d56842ac30436 Mon Sep 17 00:00:00 2001
From: jspijker <j.spijker@ultimaker.com>
Date: Thu, 5 Jan 2023 13:41:26 +0100
Subject: [PATCH 1/3] Set height and of the material brand menuitem explicitly

Contributes to CURA-9522
---
 resources/qml/Menus/MaterialBrandMenu.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml
index 5a5838f4ca..deb1021cf5 100644
--- a/resources/qml/Menus/MaterialBrandMenu.qml
+++ b/resources/qml/Menus/MaterialBrandMenu.qml
@@ -14,6 +14,7 @@ Instead we'll use a pop-up which doesn't seem to have that problem. */
 Cura.MenuItem
 {
     id: materialBrandMenu
+    height: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
     overrideShowArrow: true
 
     property var materialTypesModel

From 12701b7dac75bc6764e2efe88d6de081a78f1945 Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Fri, 6 Jan 2023 13:25:57 +0100
Subject: [PATCH 2/3] Hacky fix for mouseArea bug.

CURA-9522
---
 resources/qml/Menus/MaterialBrandSubMenu.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml
index bc02e79cdb..318afd9c60 100644
--- a/resources/qml/Menus/MaterialBrandSubMenu.qml
+++ b/resources/qml/Menus/MaterialBrandSubMenu.qml
@@ -12,11 +12,13 @@ Popup
 {
     id: materialBrandSubMenu
 
-    bottomPadding: UM.Theme.getSize("thin_margin").height
+    // There is a bug where hovering the bottom half of the last element causes the popup to close.
+    // Undo this commit if you find a fix.
+    bottomPadding: -UM.Theme.getSize("thin_margin").height
     topPadding: UM.Theme.getSize("thin_margin").height
 
     implicitWidth: scrollViewContent.width + scrollbar.width + leftPadding + rightPadding
-    implicitHeight: scrollViewContent.height + bottomPadding + topPadding
+    implicitHeight: scrollViewContent.height + bottomPadding + topPadding + (2 * UM.Theme.getSize("thin_margin").height)
 
     // offset position relative to the parent
     property int implicitX: parent.width - UM.Theme.getSize("default_lining").width

From 803770e38dbe2aedeb7c18209ebd4ff57cbc6db7 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Fri, 6 Jan 2023 13:56:53 +0100
Subject: [PATCH 3/3] msi input as a string

---
 .github/workflows/cura-all-installers.yml | 10 +++++-----
 .github/workflows/cura-installer.yml      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml
index cf737f810b..5c7a5b2e63 100644
--- a/.github/workflows/cura-all-installers.yml
+++ b/.github/workflows/cura-all-installers.yml
@@ -72,7 +72,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: false
+            msi: 'false'
         secrets: inherit
 
     windows-installer-create-msi:
@@ -87,7 +87,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: true
+            msi: 'true'
         secrets: inherit
 
     linux-installer-create:
@@ -102,7 +102,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: false
+            msi: 'false'
         secrets: inherit
 
     linux-modern-installer-create:
@@ -117,7 +117,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: false
+            msi: 'false'
         secrets: inherit
 
     macos-installer-create:
@@ -132,5 +132,5 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: false
+            msi: 'false'
         secrets: inherit
diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index c42d781da6..fb8a6e08fb 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -47,8 +47,8 @@ on:
             msi:
                 description: 'Create the msi'
                 default: false
-                required: true
-                type: boolean
+                required: 'true'
+                type: string
 
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}