From 75e92aaa7823bf793ff1d46c076389ce2f927790 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 Apr 2019 14:49:52 +0200 Subject: [PATCH] Adjust printer setup page for Mac CURA-6057 --- .../MachineSettingsAction/MachineSettingsExtruderTab.qml | 8 ++++---- .../MachineSettingsAction/MachineSettingsPrinterTab.qml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index f941d13561..e05d8e75fc 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -20,12 +20,12 @@ Item anchors.right: parent.right anchors.top: parent.top - property int labelWidth: 180 - property int controlWidth: UM.Theme.getSize("setting_control").width * 3 / 4 + property int labelWidth: 210 * screenScaleFactor + property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0 property var labelFont: UM.Theme.getFont("medium") - property int columnWidth: (parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2 - property int columnSpacing: 3 + property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0 + property int columnSpacing: 3 * screenScaleFactor property int propertyStoreIndex: manager.storeContainerIndex // definition_changes property string extruderStackId: "" diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index ccc0548059..3287643286 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -20,12 +20,12 @@ Item anchors.right: parent.right anchors.top: parent.top - property int labelWidth: 130 - property int controlWidth: UM.Theme.getSize("setting_control").width * 3 / 4 + property int labelWidth: 120 * screenScaleFactor + property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0 property var labelFont: UM.Theme.getFont("default") - property int columnWidth: (parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2 - property int columnSpacing: 3 + property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0 + property int columnSpacing: 3 * screenScaleFactor property int propertyStoreIndex: manager.storeContainerIndex // definition_changes property string machineStackId: Cura.MachineManager.activeMachineId