diff options
author | Ghostkeeper <rubend@tutanota.com> | 2019-06-06 10:44:42 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2019-06-06 10:44:42 +0300 |
commit | 3ea68e6c7ffa13352441459b1f2c9cdd40c2679f (patch) | |
tree | e5abfff5a6d31e7854ca1b79a74122926a3b60ed /plugins/MachineSettingsAction | |
parent | 499e02579e03b53d4b88ca341282c51230064ab6 (diff) |
Fix width of labels in machine settings
- Elide the titles in the columns.
- Give the width of a ratio so that it doesn't matter if the font renders differently or if we resize the window.
Fixes #5742.
Diffstat (limited to 'plugins/MachineSettingsAction')
-rw-r--r-- | plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 1535301616..2556eb3a9c 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -20,14 +20,14 @@ Item anchors.right: parent.right anchors.top: parent.top - 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) | 0 property int columnSpacing: 3 * screenScaleFactor property int propertyStoreIndex: manager ? manager.storeContainerIndex : 1 // definition_changes + property int labelWidth: (columnWidth * 2 / 3 - UM.Theme.getSize("default_margin").width * 2) | 0 + property int controlWidth: (columnWidth / 3) | 0 + property var labelFont: UM.Theme.getFont("default") + property string machineStackId: Cura.MachineManager.activeMachineId property var forceUpdateFunction: manager.forceUpdate @@ -59,6 +59,8 @@ Item font: UM.Theme.getFont("medium_bold") color: UM.Theme.getColor("text") renderType: Text.NativeRendering + width: parent.width + elide: Text.ElideRight } Cura.NumericTextFieldWithUnit // "X (Width)" @@ -175,6 +177,8 @@ Item font: UM.Theme.getFont("medium_bold") color: UM.Theme.getColor("text") renderType: Text.NativeRendering + width: parent.width + elide: Text.ElideRight } Cura.PrintHeadMinMaxTextField // "X min" |