From d6d4617356158fa5868d23b542b4e7f94c1ef394 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 3 Aug 2017 10:56:21 +0200 Subject: [PATCH] Resize camera image to fit small windows if necessary --- plugins/UM3NetworkPrinting/MonitorItem.qml | 15 +++++++++++++-- resources/qml/Cura.qml | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/MonitorItem.qml b/plugins/UM3NetworkPrinting/MonitorItem.qml index d3803ea877..ffa2e8c85d 100644 --- a/plugins/UM3NetworkPrinting/MonitorItem.qml +++ b/plugins/UM3NetworkPrinting/MonitorItem.qml @@ -9,9 +9,20 @@ Component Image { id: cameraImage - width: sourceSize.width - height: sourceSize.height * width / sourceSize.width + property bool proportionalHeight: + { + if(sourceSize.height == 0 || maximumHeight == 0) + { + return true; + } + return (sourceSize.width / sourceSize.height) > (maximumWidth / maximumHeight); + } + property real _width: Math.min(maximumWidth, sourceSize.width) + property real _height: Math.min(maximumHeight, sourceSize.height) + width: proportionalHeight ? _width : sourceSize.width * _height / sourceSize.height + height: !proportionalHeight ? _height : sourceSize.height * _width / sourceSize.width anchors.horizontalCenter: parent.horizontalCenter + onVisibleChanged: { if(visible) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 3aaf63a2fd..c232351741 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -466,6 +466,8 @@ UM.MainWindow anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2 + property real maximumWidth: viewportOverlay.width + property real maximumHeight: viewportOverlay.height } UM.MessageStack