diff options
| author | Mark <mark.suurmond@gmail.com> | 2018-02-09 13:30:56 +0300 |
|---|---|---|
| committer | Mark <mark.suurmond@gmail.com> | 2018-02-09 15:01:56 +0300 |
| commit | b52bf6decfab7b1262f1f7e7b607536c27ec6c68 (patch) | |
| tree | 1300eae57d5e6936d75300b9cc82368aef15f202 /plugins/UltimakerMachineActions | |
| parent | e7e476cb154c75321606e2452aa36a6abfb1919e (diff) | |
resolve conflict
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 5a1f8f26a7..aee75d1db5 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: UM.Theme.getSize("default_margin").width/2 + anchors.leftMargin: Math.floor(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: UM.Theme.getSize("default_margin").width/2 + anchors.leftMargin: Math.floor(UM.Theme.getSize("default_margin").width/2) visible: checkupMachineAction.usbConnected && manager.hasHeatedBed Button { |