From 0a01e7c25b6ca470396452cf5a25cf177d899537 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 12 Sep 2018 16:31:59 +0200 Subject: [PATCH] Monitor Tab - Improved camera icon - Fixed: Camera icon is too small, and the icon does not look centred - Fixed: No hover effect for the camera button Contributes to CL-1049 --- .../resources/qml/ClusterControlItem.qml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml index a5145cc201..8ad6e5ea87 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml @@ -628,24 +628,28 @@ Component Rectangle { - id: showCameraIcon - width: 35 * screenScaleFactor + id: showCameraButton + width: 36 * screenScaleFactor height: width radius: 0.5 * width anchors.left: parent.left anchors.bottom: printJobPreview.bottom - color: UM.Theme.getColor("setting_control_border_highlight") - Image + color: showCameraMouseArea.containsMouse ? UM.Theme.getColor("primary_hover") : UM.Theme.getColor("primary") + UM.RecolorImage { - width: parent.width + id: showCameraIcon + width: parent.width - 1 height: width - anchors.right: parent.right - anchors.rightMargin: parent.rightMargin + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + color: UM.Theme.getColor("primary_text") source: "../svg/camera-icon.svg" } MouseArea { + id: showCameraMouseArea anchors.fill:parent + hoverEnabled: true onClicked: { OutputDevice.setActiveCamera(modelData.camera)