3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-10 23:38:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0

Browse source
This commit is contained in:
Jaime van Kessel 2017-10-02 15:13:18 +02:00
commit 7539bddf83
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UM3NetworkPrinting/ClusterMonitorItem.qml
View file

@ -10,7 +10,7 @@ Component
Rectangle Rectangle
{ {
width: maximumWidth width: maximumWidth
height: maximumHeight height: maximumHeight
color: UM.Theme.getColor("viewport_background") color: UM.Theme.getColor("viewport_background")
property var emphasisColor: "#44c0ff" //TODO: should be linked to theme. property var emphasisColor: "#44c0ff" //TODO: should be linked to theme.
@ -49,7 +49,7 @@ Component
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.top: parent.top anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: Math.min(800 * screenScaleFactor, maximumWidth) width: Math.min(800 * screenScaleFactor, maximumWidth)
height: children.height height: children.height
visible: OutputDevice.connectedPrinters.length != 0 visible: OutputDevice.connectedPrinters.length != 0

2
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -290,7 +290,7 @@ Rectangle
Image Image
{ {
width: statusText.height * screenScaleFactor width: statusText.height
height: width height: width
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width