3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

4
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -70,8 +70,8 @@ Cura.MachineAction
anchors.top: pageTitle.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
property real columnWidth: ((width - 3 * UM.Theme.getSize("default_margin").width) / 2) | 0
property real labelColumnWidth: columnWidth * 0.5
property real columnWidth: Math.floor((width - 3 * UM.Theme.getSize("default_margin").width) / 2)
property real labelColumnWidth: Math.floor(columnWidth / 2)
Tab
{