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

SpinBox fixed for values above the max value

Browse Source 
Spinbox now doesn't take values above the designated maximum
Fixes CURA-10096
This commit is contained in:
saumya.jain 2023-07-06 16:07:40 +02:00
parent f0186ff9e3
commit fe5893feb6
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/qml/SpinBox.qml
View File

@ -54,9 +54,20 @@ Item
from: Math.floor(base.from / base.stepSize)
to: Math.floor(base.to / base.stepSize)
function clamp(value, min, max)
{
return Math.max((Math.min(value, max)), min);
}
valueFromText: function(text)
{
return parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize;
var value = parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize ;
if (Number.isNaN(value))
{
value = from
}
return clamp(value, from, to);
}
textFromValue: function(value)
@ -69,6 +80,7 @@ Item
onValueModified:
{
base.value = value * base.stepSize;
spinBoxText.text = spinBox.textFromValue(value);
}
// This forces TextField to commit typed values before incrementing with buttons.
@ -87,6 +99,7 @@ Item
contentItem: Cura.TextField
{
id: spinBoxText
text: spinBox.textFromValue(spinBox.value, spinBox.locale)
validator: base.validator
@ -97,6 +110,13 @@ Item
base.editingFinished();
}
}
onTextChanged:
{
var value = spinBox.valueFromText(spinBoxText.text);
spinBoxText.text = spinBox.textFromValue(value);
spinBox.value = value;
}
}
down.indicator: Rectangle