From ff824b718c451e59ec0410dd6acdb1826b6fc2b9 Mon Sep 17 00:00:00 2001
From: "j.delarago" <joeydelarago@gmail.com>
Date: Mon, 14 Mar 2022 16:14:57 +0100
Subject: [PATCH 1/3] Replace burger buttons with generic BurgerButton.qml
 component.

Move comment onto newline (Comments on the same line as component names break text folding)

Update burger menu margins in SettingView to match design

CURA-9007
---
 resources/qml/Preferences/ProfilesPage.qml |  5 ++++-
 resources/qml/Settings/SettingView.qml     | 12 ++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index b25bad39fb..1b18cbce4c 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -303,6 +303,7 @@ UM.ManagementPage
                 left: parent.left
                 right: parent.right
                 top: parent.top
+                topMargin: UM.Theme.getSize("narrow_margin").height
             }
 
             spacing: UM.Theme.getSize("default_margin").height
@@ -364,7 +365,9 @@ UM.ManagementPage
             UM.TabRow
             {
                 id: profileExtruderTabs
-                UM.TabRowButton // One extra tab for the global settings.
+
+                // One extra tab for the global settings.
+                UM.TabRowButton
                 {
                     text: catalog.i18nc("@title:tab", "Global Settings")
                 }
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index ecafd25913..56588ca6ca 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -25,7 +25,6 @@ Item
             top: parent.top
             left: parent.left
             right: settingVisibilityMenu.left
-            rightMargin: UM.Theme.getSize("default_margin").width
         }
         height: UM.Theme.getSize("print_setup_big_item").height
 
@@ -142,22 +141,15 @@ Item
         }
     }
 
-    UM.SimpleButton
+    UM.BurgerButton
     {
         id: settingVisibilityMenu
 
         anchors
         {
-            top: filterContainer.top
-            bottom: filterContainer.bottom
+            verticalCenter: filterContainer.verticalCenter
             right: parent.right
-            rightMargin: UM.Theme.getSize("wide_margin").width
         }
-        width: UM.Theme.getSize("medium_button_icon").width
-        height: UM.Theme.getSize("medium_button_icon").height
-        iconSource: UM.Theme.getIcon("Hamburger")
-        hoverColor: UM.Theme.getColor("small_button_text_hover")
-        color: UM.Theme.getColor("small_button_text")
 
         onClicked:
         {

From 495462182c9a7451c02253e1194bf74e36bc207e Mon Sep 17 00:00:00 2001
From: "j.delarago" <joeydelarago@gmail.com>
Date: Tue, 15 Mar 2022 14:08:28 +0100
Subject: [PATCH 2/3] Move background circle into background

Change burger icon color to correct color for dark+light mode

CURA-9005
---
 resources/qml/Settings/SettingView.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 56588ca6ca..6364dbd167 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -153,11 +153,14 @@ Item
 
         onClicked:
         {
+            // Fix for strange bug where height is havled after creating a popup
+            var height = settingVisibilityMenu.height
             settingVisibilityPresetsMenu.popup(
                 settingVisibilityMenu,
-                -settingVisibilityPresetsMenu.width + UM.Theme.getSize("default_margin").width,
+                -settingVisibilityPresetsMenu.width,
                 settingVisibilityMenu.height
             )
+            settingVisibilityMenu.height = height
         }
     }
 

From 7148ca5d06bb03921f2da8a43b347f073ee0fcc8 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 15 Mar 2022 14:42:53 +0100
Subject: [PATCH 3/3] Fix poup rescaling the burgermenu weirdly

CURA-9007
---
 resources/qml/Settings/SettingView.qml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 56588ca6ca..37cc70de9d 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -130,8 +130,6 @@ Item
     SettingVisibilityPresetsMenu
     {
         id: settingVisibilityPresetsMenu
-        x: settingVisibilityMenu.x
-        y: settingVisibilityMenu.y
         onCollapseAllCategories:
         {
             settingsSearchTimer.stop()
@@ -154,12 +152,19 @@ Item
         onClicked:
         {
             settingVisibilityPresetsMenu.popup(
-                settingVisibilityMenu,
+                popupContainer,
                 -settingVisibilityPresetsMenu.width + UM.Theme.getSize("default_margin").width,
                 settingVisibilityMenu.height
             )
         }
     }
+    Item
+    {
+        // Work around to prevent the buttom from being rescaled if a popup is attached
+        id: popupContainer
+        anchors.bottom: settingVisibilityMenu.bottom
+        anchors.right: settingVisibilityMenu.right
+    }
 
     // Mouse area that gathers the scroll events to not propagate it to the main view.
     MouseArea