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

Fixing some spacing issues with camera button

Browse source 
Contributes to CL-1063
This commit is contained in:
Ian Paschal 2018-10-31 11:23:57 +01:00
parent d5806d145d
commit 903054190d
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
View file

@ -36,7 +36,7 @@ Item {
return UM.Theme.getColor("monitor_card_background"); return UM.Theme.getColor("monitor_card_background");
} }
} }
height: childrenRect.height; height: childrenRect.height + UM.Theme.getSize("default_margin").height;
layer.effect: DropShadow { layer.effect: DropShadow {
radius: root.shadowRadius; radius: root.shadowRadius;
verticalOffset: root.shadowOffset; verticalOffset: root.shadowOffset;
@ -46,6 +46,11 @@ Item {
width: parent.width - 2 * shadowRadius; width: parent.width - 2 * shadowRadius;
Column { Column {
id: cardContents;
anchors {
top: parent.top;
topMargin: UM.Theme.getSize("default_margin").height;
}
height: childrenRect.height; height: childrenRect.height;
width: parent.width; width: parent.width;
spacing: UM.Theme.getSize("default_margin").height; spacing: UM.Theme.getSize("default_margin").height;
@ -53,7 +58,7 @@ Item {
// Main card // Main card
Item { Item {
id: mainCard; id: mainCard;
height: 60 * screenScaleFactor + UM.Theme.getSize("default_margin").width; height: 60 * screenScaleFactor;
width: parent.width; width: parent.width;
// Machine icon // Machine icon
@ -109,7 +114,7 @@ Item {
id: printerInfo; id: printerInfo;
anchors { anchors {
left: machineIcon.right; left: machineIcon.right;
leftMargin: UM.Theme.getSize("default_margin").width; leftMargin: UM.Theme.getSize("wide_margin").width;
right: collapseIcon.left; right: collapseIcon.left;
verticalCenter: machineIcon.verticalCenter; verticalCenter: machineIcon.verticalCenter;
} }
@ -250,11 +255,16 @@ Item {
iconSource: "../svg/camera-icon.svg"; iconSource: "../svg/camera-icon.svg";
visible: root.printer && root.printJob; visible: root.printer && root.printJob;
} }
}
// Progress bar // Progress bar
PrinterCardProgressBar { PrinterCardProgressBar {
visible: printer && printer.activePrintJob != null; anchors {
top: cardContents.bottom;
topMargin: UM.Theme.getSize("default_margin").height;
} }
visible: printer && printer.activePrintJob != null;
width: parent.width;
} }
} }
} }