GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 05:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Ultimaker:main' into main

Browse Source
This commit is contained in:
eMotion-Tech 2023-05-05 11:44:28 +02:00 committed by GitHub
commit f2b1d19826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/qml/PrinterSelector/PrintSelectorCard.qml
View File

@ -35,8 +35,9 @@ Rectangle
id: printerTitle id: printerTitle
Layout.preferredWidth: parent.width / 3 Layout.preferredWidth: parent.width / 3
Layout.preferredHeight: childrenRect.height
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
Layout.fillHeight: false Layout.fillHeight: false
source: UM.Theme.getIcon("Printer") source: UM.Theme.getIcon("Printer")
@ -45,13 +46,14 @@ Rectangle
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
} }
ColumnLayout Column
{ {
id: extruderInformation id: extruderInformation
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width / 2 Layout.preferredWidth: parent.width / 2
Layout.alignment: Qt.AlignTop Layout.preferredHeight: childrenRect.height
spacing: UM.Theme.getSize("narrow_margin").width Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
spacing: UM.Theme.getSize("narrow_margin").height
Repeater Repeater
{ {
@ -59,7 +61,7 @@ Rectangle
Item Item
{ {
Layout.preferredWidth: extruderInformation.width width: extruderInformation.width
height: childrenRect.height height: childrenRect.height
Cura.ExtruderIcon Cura.ExtruderIcon
@ -117,7 +119,8 @@ Rectangle
implicitWidth: UM.Theme.getSize("large_button").width implicitWidth: UM.Theme.getSize("large_button").width
implicitHeight: implicitWidth implicitHeight: implicitWidth
Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
Layout.preferredHeight: childrenRect.height
padding: 0 padding: 0
background: Rectangle background: Rectangle