From 4bb72cdd1a33f0bc52b0515654e9775f953da10c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 2 May 2022 16:51:07 +0200 Subject: [PATCH 1/2] Set `stepSize` property on `SpinBox` that reflects its `decimals` CURA-9201 --- resources/qml/Preferences/Materials/MaterialsView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index b033f755cf..77761f0c9e 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -601,6 +601,7 @@ Item suffix: " " + model.unit to: 99999 decimals: model.unit == "mm" ? 2 : 0 + stepSize: Math.pow(10, -decimals) onEditingFinished: materialPropertyProvider.setPropertyValue("value", value) } From cb4f1a8ab588db026c8b5eb11808ae90f9897485 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 2 May 2022 17:07:52 +0200 Subject: [PATCH 2/2] Replace `SpinBox` with `NumericTextFieldWithUnit` CURA-9146 --- resources/qml/Preferences/Materials/MaterialsView.qml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 77761f0c9e..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,12 +598,11 @@ Item return 0; } width: settingsPage.columnWidth - suffix: " " + model.unit - to: 99999 + maximum: 99999 + unitText: model.unit decimals: model.unit == "mm" ? 2 : 0 - stepSize: Math.pow(10, -decimals) - onEditingFinished: materialPropertyProvider.setPropertyValue("value", value) + editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) } UM.ContainerPropertyProvider