diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-05-03 14:46:49 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-05-03 14:46:49 +0300 |
| commit | c3918da6a578dc162b5ed7cc573cfe3398666528 (patch) | |
| tree | 5481153b4d8f53d8e50839e828ebe8f264ed3ff7 /resources/qml | |
| parent | f13ec6526b45683bdc445bf338c85dbbce01b90b (diff) | |
| parent | cb4f1a8ab588db026c8b5eb11808ae90f9897485 (diff) | |
Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/Preferences/Materials/MaterialsView.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index b033f755cf..a172949812 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -574,11 +574,11 @@ Item elide: Text.ElideRight verticalAlignment: Qt.AlignVCenter } - Cura.SpinBox + Cura.NumericTextFieldWithUnit { id: spinBox anchors.left: label.right - value: + valueText: { // In case the setting is not in the material... if (!isNaN(parseFloat(materialPropertyProvider.properties.value))) @@ -598,11 +598,11 @@ Item return 0; } width: settingsPage.columnWidth - suffix: " " + model.unit - to: 99999 + maximum: 99999 + unitText: model.unit decimals: model.unit == "mm" ? 2 : 0 - onEditingFinished: materialPropertyProvider.setPropertyValue("value", value) + editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) } UM.ContainerPropertyProvider |