From 321e531b1cf9485787e2fa1d4b968c99523120a3 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 15:03:07 +0200 Subject: [PATCH 1/2] CL-457 remove screenScaleFactor because statusText.height already has devicePixelRatio included --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 0500221990..f18e3cfe08 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -290,7 +290,7 @@ Rectangle Image { - width: statusText.height * screenScaleFactor + width: statusText.height height: width anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width From e6fe33dcb9f0e7685647f95eea1a7d748b66d40e Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 15:04:45 +0200 Subject: [PATCH 2/2] CL-457 removed trailing spaces --- plugins/UM3NetworkPrinting/ClusterMonitorItem.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml index 497b762ea9..c1d852072f 100644 --- a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml @@ -10,7 +10,7 @@ Component Rectangle { width: maximumWidth - height: maximumHeight + height: maximumHeight color: UM.Theme.getColor("viewport_background") property var emphasisColor: "#44c0ff" //TODO: should be linked to theme. @@ -49,7 +49,7 @@ Component anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter - + width: Math.min(800 * screenScaleFactor, maximumWidth) height: children.height visible: OutputDevice.connectedPrinters.length != 0