Merge remote-tracking branch 'origin/CURA-9424_update_loading_projects_design' into CURA-9424_update_loading_projects_design

This commit is contained in:
Joey de l'Arago 2022-11-15 14:14:11 +01:00
commit 7254c8ac78
3 changed files with 4 additions and 4 deletions

View file

@ -21,14 +21,14 @@ Row
{ {
id: leftLabel id: leftLabel
text: catalog.i18nc("@action:label", "Type") text: catalog.i18nc("@action:label", "Type")
width: (parent.width / 4) | 0 width: Math.round(parent.width / 4)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
UM.Label UM.Label
{ {
id: rightLabel id: rightLabel
text: manager.machineType text: manager.machineType
width: (parent.width / 3) | 0 width: Math.round(parent.width / 3)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
} }

View file

@ -50,7 +50,7 @@ Item
Item Item
{ {
id: comboboxTooltip id: comboboxTooltip
width: (parent.width / 2.5) | 0 width: Math.round(parent.width / 2.5)
height: visible ? UM.Theme.getSize("default_margin").height : 0 height: visible ? UM.Theme.getSize("default_margin").height : 0
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right

View file

@ -91,7 +91,7 @@ Item
fixedWidthMode: true fixedWidthMode: true
// The maximum width of the button is half of the total space, minus the padding of the parent, the right // The maximum width of the button is half of the total space, minus the padding of the parent, the right
// padding of the component and half the spacing because of the space between buttons. // padding of the component and half the spacing because of the space between buttons.
width: parent.width / 2 - rightPadding * 1.5 width: Math.round(parent.width / 2 - rightPadding * 1.5)
onClicked: onClicked:
{ {
machineSelection.toggleContent() machineSelection.toggleContent()