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

resolve conflict

Browse source
This commit is contained in:
Mark 2018-02-09 11:30:56 +01:00
parent e7e476cb15
commit b52bf6decf
17 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/MonitorButton.qml
View file

@ -179,7 +179,7 @@ Item
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width;
height: UM.Theme.getSize("progressbar").height;
anchors.top: statusLabel.bottom;
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 4;
anchors.topMargin: Math.floor(UM.Theme.getSize("sidebar_margin").height / 4);
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
}