GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 06:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0

Browse Source
This commit is contained in:
Jaime van Kessel 2022-05-03 13:46:49 +02:00
commit c3918da6a5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -574,11 +574,11 @@ Item
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter
} }
Cura.SpinBox Cura.NumericTextFieldWithUnit
{ {
id: spinBox id: spinBox
anchors.left: label.right anchors.left: label.right
value: valueText:
{ {
// In case the setting is not in the material... // In case the setting is not in the material...
if (!isNaN(parseFloat(materialPropertyProvider.properties.value))) if (!isNaN(parseFloat(materialPropertyProvider.properties.value)))
@ -598,11 +598,11 @@ Item
return 0; return 0;
} }
width: settingsPage.columnWidth width: settingsPage.columnWidth
suffix: " " + model.unit maximum: 99999
to: 99999 unitText: model.unit
decimals: model.unit == "mm" ? 2 : 0 decimals: model.unit == "mm" ? 2 : 0
onEditingFinished: materialPropertyProvider.setPropertyValue("value", value) editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value)
} }
UM.ContainerPropertyProvider UM.ContainerPropertyProvider