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

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

Browse source
This commit is contained in:
Jaime van Kessel 2017-12-14 13:03:02 +01:00
commit 24bd32477a
127 changed files with 1078 additions and 824 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/MonitorStage/MonitorMainView.qml
View file

@ -8,6 +8,9 @@ import Cura 1.0 as Cura
Item
{
width: parent.width
height: parent.height
// We show a nice overlay on the 3D viewer when the current output device has no monitor view
Rectangle
{
@ -29,6 +32,9 @@ Item
{
id: monitorViewComponent
width: parent.width
height: parent.height
property real maximumWidth: parent.width
property real maximumHeight: parent.height