Adjust margins

fieldOfView · Mar 2, 2023 · 85cd55d · 85cd55d
1 parent e8b6e8a
commit 85cd55d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/resources/qml/ProfileSelector40.qml b/resources/qml/ProfileSelector40.qml
@@ -47,7 +47,7 @@ Item
             verticalCenter: collapseButton.verticalCenter
 
             right: collapseButton.left
-            rightMargin: UM.Theme.getSize("thin_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
         iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
         width: UM.Theme.getSize("print_setup_icon").width

diff --git a/resources/qml/ProfileSelector44.qml b/resources/qml/ProfileSelector44.qml
@@ -198,7 +198,7 @@ Item
             verticalCenter: collapseButton.verticalCenter
 
             right: collapseButton.left
-            rightMargin: UM.Theme.getSize("thin_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
         iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
         width: UM.Theme.getSize("default_arrow").width + UM.Theme.getSize("default_lining").width

diff --git a/resources/qml/ProfileSelector50.qml b/resources/qml/ProfileSelector50.qml
@@ -191,7 +191,7 @@ Item
             verticalCenter: modeToggleSwitch.verticalCenter
 
             right: collapseButton.left
-            rightMargin: UM.Theme.getSize("thin_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
         iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
         width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

diff --git a/resources/qml/ProfileSelector51.qml b/resources/qml/ProfileSelector51.qml
@@ -196,7 +196,7 @@ Item
             verticalCenter: modeToggleSwitch.verticalCenter
 
             right: collapseButton.left
-            rightMargin: UM.Theme.getSize("thin_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
         iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
         width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

diff --git a/resources/qml/ProfileSelector53.qml b/resources/qml/ProfileSelector53.qml
@@ -180,7 +180,7 @@ Item
             verticalCenter: modeToggleSwitch.verticalCenter
 
             right: collapseButton.left
-            rightMargin: UM.Theme.getSize("thin_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
         iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
         width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

diff --git a/resources/qml/SidebarContents.qml b/resources/qml/SidebarContents.qml
@@ -107,7 +107,7 @@ Cura.RoundedRectangle
                 anchors
                 {
                     right: parent.right
-                    rightMargin: UM.Theme.getSize("wide_margin").width + UM.Theme.getSize("narrow_margin").width
+                    rightMargin: UM.Theme.getSize("default_margin").width
                     verticalCenter: parent.verticalCenter
                 }
                 iconSource:
@@ -158,6 +158,11 @@ Cura.RoundedRectangle
                 Component.onCompleted:
                 {
                     configurationMenu.contentItem.children[1].visible = false // separator
+                    if(!isGE50)
+                    {
+                        configurationMenu.contentItem.children[0].x = 2 * UM.Theme.getSize("default_margin").width // extruder config
+                        configurationMenu.contentItem.children[2].x = UM.Theme.getSize("default_margin").width // Custom/Configurations
+                    }
 
                     var autoConfiguration = configurationMenu.contentItem.children[0].children[0];
                     autoConfiguration.children[0].visible = false // "Configurations" label