diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index 8a6a6d297c..c97f16b29c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -48,15 +48,13 @@ Item { height: childrenRect.height; // Main content - Rectangle { + Item { id: mainContent; - color: root.debug ? "red" : "transparent"; width: parent.width; height: 200; // TODO: Theme! // Left content - Rectangle { - color: root.debug ? "lightblue" : "transparent"; + Item { anchors { left: parent.left; right: parent.horizontalCenter; @@ -179,8 +177,7 @@ Item { } // Right content - Rectangle { - color: root.debug ? "blue" : "transparent"; + Item { anchors { left: parent.horizontalCenter; right: parent.right; @@ -238,7 +235,7 @@ Item { } } - Rectangle { + Item { id: configChangesBox; width: parent.width; height: childrenRect.height; @@ -322,9 +319,8 @@ Item { } // Config change details - Rectangle { + Item { id: configChangeDetails; - color: "transparent"; width: parent.width; visible: false; // In case of really massive multi-line configuration changes @@ -332,8 +328,7 @@ Item { Behavior on height { NumberAnimation { duration: 100 } } anchors.top: configChangeToggle.bottom; - Rectangle { - color: "transparent"; + Item { clip: true; anchors { fill: parent; diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml index d116df8b28..ded249b9c9 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml @@ -73,12 +73,10 @@ Item { if (root.printJob) { // Use more-specific print job if possible return root.printJob.configuration.extruderConfigurations[i]; - } else { - if (root.printer) { - return root.printer.printerConfiguration.extruderConfigurations[i]; - } else { - return null; - } } + if (root.printer) { + return root.printer.printerConfiguration.extruderConfigurations[i]; + } + return null; } } \ No newline at end of file