Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements

Monitor tab spacing improvements
This commit is contained in:
Simon Edwards 2018-10-30 14:57:18 +01:00 committed by GitHub
commit 03dd26e6e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -48,11 +48,12 @@ Item {
Column { Column {
height: childrenRect.height; height: childrenRect.height;
width: parent.width; width: parent.width;
spacing: UM.Theme.getSize("default_margin").height;
// Main card // Main card
Item { Item {
id: mainCard; id: mainCard;
height: 60 * screenScaleFactor + 2 * UM.Theme.getSize("default_margin").width; height: 60 * screenScaleFactor + UM.Theme.getSize("default_margin").width;
width: parent.width; width: parent.width;
// Machine icon // Machine icon
@ -240,19 +241,16 @@ Item {
visible: root.printer; visible: root.printer;
} }
Item { CameraButton {
id: cameraButtonWrapper; id: showCameraButton;
height: showCameraButton.width + 2 * UM.Theme.getSize("default_margin").height; anchors {
visible: root.printer && root.printJob; left: parent.left;
width: height; leftMargin: UM.Theme.getSize("default_margin").width;
CameraButton {
id: showCameraButton;
anchors.centerIn: parent;
iconSource: "../svg/camera-icon.svg";
} }
iconSource: "../svg/camera-icon.svg";
visible: root.printer && root.printJob;
} }
// Progress bar // Progress bar
PrinterCardProgressBar { PrinterCardProgressBar {
visible: printer && printer.activePrintJob != null; visible: printer && printer.activePrintJob != null;