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

Merge branch '3.2'

Browse source 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
This commit is contained in:
Ghostkeeper 2018-02-12 13:10:24 +01:00
commit 03b4213e92
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
17 changed files with 46 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/SaveButton.qml
View file

@ -76,7 +76,7 @@ Item {
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
height: UM.Theme.getSize("progressbar").height
anchors.top: statusLabel.bottom
anchors.topMargin: Math.floor(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
radius: UM.Theme.getSize("progressbar_radius").width