diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2018-02-14 12:53:51 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2018-02-14 12:53:51 +0300 |
| commit | ee9de1f11b5e4f6100426eccf8c8629fa0fa45e6 (patch) | |
| tree | e3d9b772e42b4538b71da7ac61e198a0a1c48f4a /plugins/UltimakerMachineActions | |
| parent | 4d3f7d098f166dbdafd4492ed226421916950d92 (diff) | |
| parent | 582f6ff2d2f854670320a75fe528b40cea471b31 (diff) | |
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
Diffstat (limited to 'plugins/UltimakerMachineActions')
| -rw-r--r-- | plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml index aee75d1db5..b92638aa12 100644 --- a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml @@ -180,7 +180,7 @@ Cura.MachineAction height: childrenRect.height anchors.top: nozzleTempLabel.top anchors.left: bedTempStatus.right - anchors.leftMargin: Math.floor(UM.Theme.getSize("default_margin").width/2) + anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").width/2) visible: checkupMachineAction.usbConnected Button { @@ -241,7 +241,7 @@ Cura.MachineAction height: childrenRect.height anchors.top: bedTempLabel.top anchors.left: bedTempStatus.right - anchors.leftMargin: Math.floor(UM.Theme.getSize("default_margin").width/2) + anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").width/2) visible: checkupMachineAction.usbConnected && manager.hasHeatedBed Button { |