Merge branch '3.2'

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

View file

@ -187,8 +187,8 @@ Button
id: settingsButton
visible: base.hovered || settingsButton.hovered
height: base.height * 0.6
width: base.height * 0.6
height: Math.floor(base.height * 0.6)
width: Math.floor(base.height * 0.6)
anchors {
right: inheritButton.visible ? inheritButton.left : parent.right