From 2722ac5a8f93f50529bed24bb8931c9a13f2ee27 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 13 Feb 2017 09:32:16 +0100 Subject: [PATCH] Re-use repeater count instead of listening to machineExtruderCount everywhere Might be slightly more efficient and/or update stuff in the correct order. Contributes to issue CURA-3161. --- resources/qml/PrintMonitor.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 7e3c4e4b45..43f771296a 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -77,6 +77,7 @@ Column Repeater { + id: extrudersRepeater model: machineExtruderCount.properties.value delegate: Rectangle { @@ -84,13 +85,13 @@ Column color: UM.Theme.getColor("sidebar") width: extrudersGrid.width / 2 - UM.Theme.getSize("sidebar_lining_thin").width / 2 height: UM.Theme.getSize("sidebar_extruder_box").height - Layout.fillWidth: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 - anchors.right: (index == machineExtruderCount.properties.value - 1 && index % 2 == 0) ? parent.right : undefined - anchors.left: (index == machineExtruderCount.properties.value - 1 && index % 2 == 0) ? parent.left : undefined + Layout.fillWidth: index == extrudersRepeater.count - 1 && index % 2 == 0 + anchors.right: (index == extrudersRepeater.count - 1 && index % 2 == 0) ? parent.right : undefined + anchors.left: (index == extrudersRepeater.count - 1 && index % 2 == 0) ? parent.left : undefined Label //Extruder name. { - text: (machineExtruderCount.properties.value > 1 && extrudersModel.getItem(index).name != null) ? extrudersModel.getItem(index).name : catalog.i18nc("@label", "Hotend") + text: (extrudersRepeater.count > 1 && extrudersModel.getItem(index).name != null) ? extrudersModel.getItem(index).name : catalog.i18nc("@label", "Hotend") color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") anchors.left: parent.left