Skip to content

Commit 85cd55d

Browse files
committed
Adjust margins
1 parent e8b6e8a commit 85cd55d

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

resources/qml/ProfileSelector40.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Item
4747
verticalCenter: collapseButton.verticalCenter
4848

4949
right: collapseButton.left
50-
rightMargin: UM.Theme.getSize("thin_margin").width
50+
rightMargin: UM.Theme.getSize("default_margin").width
5151
}
5252
iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
5353
width: UM.Theme.getSize("print_setup_icon").width

resources/qml/ProfileSelector44.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Item
198198
verticalCenter: collapseButton.verticalCenter
199199

200200
right: collapseButton.left
201-
rightMargin: UM.Theme.getSize("thin_margin").width
201+
rightMargin: UM.Theme.getSize("default_margin").width
202202
}
203203
iconSource: settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg"
204204
width: UM.Theme.getSize("default_arrow").width + UM.Theme.getSize("default_lining").width

resources/qml/ProfileSelector50.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Item
191191
verticalCenter: modeToggleSwitch.verticalCenter
192192

193193
right: collapseButton.left
194-
rightMargin: UM.Theme.getSize("thin_margin").width
194+
rightMargin: UM.Theme.getSize("default_margin").width
195195
}
196196
iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
197197
width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

resources/qml/ProfileSelector51.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Item
196196
verticalCenter: modeToggleSwitch.verticalCenter
197197

198198
right: collapseButton.left
199-
rightMargin: UM.Theme.getSize("thin_margin").width
199+
rightMargin: UM.Theme.getSize("default_margin").width
200200
}
201201
iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
202202
width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

resources/qml/ProfileSelector53.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Item
180180
verticalCenter: modeToggleSwitch.verticalCenter
181181

182182
right: collapseButton.left
183-
rightMargin: UM.Theme.getSize("thin_margin").width
183+
rightMargin: UM.Theme.getSize("default_margin").width
184184
}
185185
iconSource: Qt.resolvedUrl(settingsDocked ? "../icons/settings_undock.svg" : "../icons/settings_dock.svg")
186186
width: UM.Theme.getSize("default_arrow").width + 2 * UM.Theme.getSize("default_lining").width

resources/qml/SidebarContents.qml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Cura.RoundedRectangle
107107
anchors
108108
{
109109
right: parent.right
110-
rightMargin: UM.Theme.getSize("wide_margin").width + UM.Theme.getSize("narrow_margin").width
110+
rightMargin: UM.Theme.getSize("default_margin").width
111111
verticalCenter: parent.verticalCenter
112112
}
113113
iconSource:
@@ -158,6 +158,11 @@ Cura.RoundedRectangle
158158
Component.onCompleted:
159159
{
160160
configurationMenu.contentItem.children[1].visible = false // separator
161+
if(!isGE50)
162+
{
163+
configurationMenu.contentItem.children[0].x = 2 * UM.Theme.getSize("default_margin").width // extruder config
164+
configurationMenu.contentItem.children[2].x = UM.Theme.getSize("default_margin").width // Custom/Configurations
165+
}
161166

162167
var autoConfiguration = configurationMenu.contentItem.children[0].children[0];
163168
autoConfiguration.children[0].visible = false // "Configurations" label

0 commit comments

Comments
 (0)