From 5865d5200039c9918cdc189e4a0f2c6cc48cd9be Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 1 Oct 2017 12:01:08 +0200 Subject: [PATCH] CL-474 Fix the image used for the camera icon Subtask of CL-457 Cura plugin: primary visual improvements --- .../UM3NetworkPrinting/PrinterInfoBlock.qml | 25 ++++++++++++++----- plugins/UM3NetworkPrinting/camera-icon.svg | 9 ++++--- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index c2cb4b7383..c1ca7eba0b 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -136,15 +136,28 @@ Rectangle anchors.right: printProgressArea.left anchors.rightMargin: UM.Theme.getSize("default_margin").width color: emphasisColor - UM.RecolorImage + + Image { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + width: 40 * screenScaleFactor + height: width + anchors.right: printProgressArea.left + anchors.rightMargin: UM.Theme.getSize("default_margin").width source: "camera-icon.svg" - width: sourceSize.width - height: sourceSize.height * width / sourceSize.width - color: "white" } + + // FIXME: Currently using Image instead of UM.RecolorImage because RecolorImage has + // the bad side effect of scaling/shrinking the image on my HiDPI laptop screen(!) + + // UM.RecolorImage + // { + // anchors.verticalCenter: parent.verticalCenter + // anchors.horizontalCenter: parent.horizontalCenter + // source: "camera-icon.svg" + // width: sourceSize.width + // height: sourceSize.height * width / sourceSize.width + // color: "white" + // } } Row // PrintCode config diff --git a/plugins/UM3NetworkPrinting/camera-icon.svg b/plugins/UM3NetworkPrinting/camera-icon.svg index 2aafc4b6f4..29adfa5875 100644 --- a/plugins/UM3NetworkPrinting/camera-icon.svg +++ b/plugins/UM3NetworkPrinting/camera-icon.svg @@ -1,3 +1,6 @@ - - - + + + + + + \ No newline at end of file