diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-05-10 14:11:05 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-05-10 14:11:05 +0300 |
| commit | 4819b2484eaa82679fcd0b9048f968c1947bc018 (patch) | |
| tree | 3321d5e0024913c08fd329525cea8b7539f87868 /resources/qml | |
| parent | 44a616addd52ab077537c4dd3f35eea0eb82ceeb (diff) | |
| parent | 81c6ade4450eb4eb7ea49c932b14573b3dfb927e (diff) | |
Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 1 | ||||
| -rw-r--r-- | resources/qml/Preferences/Materials/MaterialsView.qml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 3755f0ead1..2950714d6a 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -38,6 +38,7 @@ UM.TooltipArea property alias textField: textFieldWithUnit property alias valueText: textFieldWithUnit.text + property alias enabled: textFieldWithUnit.enabled property alias editingFinishedFunction: textFieldWithUnit.editingFinishedFunction property string tooltipText: propertyProvider.properties.description ? propertyProvider.properties.description : "" diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index a172949812..d37150075b 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -601,8 +601,12 @@ Item maximum: 99999 unitText: model.unit decimals: model.unit == "mm" ? 2 : 0 + enabled: base.editingEnabled - editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) + editingFinishedFunction: function() + { + materialPropertyProvider.setPropertyValue("value", parseFloat(valueText.replace(",", "."))) + } } UM.ContainerPropertyProvider |