From afed736125a693b6fd222111ff8879dcc99abe55 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 3 May 2023 19:33:19 +0200 Subject: [PATCH 1/2] Fix compatible printers window UI issues CURA-10507 --- .../qml/PrinterSelector/PrintSelectorCard.qml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index a4cf423466..a2f326c9c1 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -35,8 +35,9 @@ Rectangle id: printerTitle Layout.preferredWidth: parent.width / 3 + Layout.preferredHeight: childrenRect.height Layout.fillWidth: true - Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter + Layout.alignment: Qt.AlignCenter Layout.fillHeight: false source: UM.Theme.getIcon("Printer") @@ -45,13 +46,14 @@ Rectangle font: UM.Theme.getFont("medium_bold") } - ColumnLayout + Column { id: extruderInformation Layout.fillWidth: true Layout.preferredWidth: parent.width / 2 - Layout.alignment: Qt.AlignTop - spacing: UM.Theme.getSize("narrow_margin").width + Layout.preferredHeight: childrenRect.height + Layout.alignment: Qt.AlignCenter + spacing: UM.Theme.getSize("narrow_margin").height Repeater { @@ -59,7 +61,7 @@ Rectangle Item { - Layout.preferredWidth: extruderInformation.width + width: extruderInformation.width height: childrenRect.height Cura.ExtruderIcon @@ -117,7 +119,8 @@ Rectangle implicitWidth: UM.Theme.getSize("large_button").width implicitHeight: implicitWidth - Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter + Layout.alignment: Qt.AlignCenter + Layout.preferredHeight: childrenRect.height padding: 0 background: Rectangle From 333c573dccf0cc90439c423f2d33587e7f6d251d Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 5 May 2023 10:43:26 +0200 Subject: [PATCH 2/2] Resolve alignment issues If the material list is too long the printer name/print button should be aligned to the top according to the figma design CURA-10507 --- resources/qml/PrinterSelector/PrintSelectorCard.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml index a2f326c9c1..efcbe07c87 100644 --- a/resources/qml/PrinterSelector/PrintSelectorCard.qml +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -37,7 +37,7 @@ Rectangle Layout.preferredWidth: parent.width / 3 Layout.preferredHeight: childrenRect.height Layout.fillWidth: true - Layout.alignment: Qt.AlignCenter + Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter Layout.fillHeight: false source: UM.Theme.getIcon("Printer") @@ -52,7 +52,7 @@ Rectangle Layout.fillWidth: true Layout.preferredWidth: parent.width / 2 Layout.preferredHeight: childrenRect.height - Layout.alignment: Qt.AlignCenter + Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter spacing: UM.Theme.getSize("narrow_margin").height Repeater @@ -119,7 +119,7 @@ Rectangle implicitWidth: UM.Theme.getSize("large_button").width implicitHeight: implicitWidth - Layout.alignment: Qt.AlignCenter + Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter Layout.preferredHeight: childrenRect.height padding: 0