Merge pull request #12999 from Ultimaker/CURA-9488_infill_density_displayed_wrong

[CURA-9488] Fix infill density being set incorrectly when changing intent
This commit is contained in:
Casper Lamboo 2022-08-17 12:52:30 +02:00 committed by GitHub
commit bf6422825b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,7 +51,17 @@ Item
{
target: infillSlider
property: "value"
value: parseInt(infillDensity.properties.value)
value: {
// The infill slider has a max value of 100. When it is given a value > 100 onValueChanged updates the setting to be 100.
// When changing to an intent with infillDensity > 100, it would always be clamped to 100.
// This will force the slider to ignore the first onValueChanged for values > 100 so higher values can be set.
var density = parseInt(infillDensity.properties.value)
if (density > 100) {
infillSlider.ignoreValueChange = true
}
return density
}
}
// Here are the elements that are shown in the left column
@ -84,6 +94,8 @@ Item
{
id: infillSlider
property var ignoreValueChange: false
width: parent.width
height: UM.Theme.getSize("print_setup_slider_handle").height // The handle is the widest element of the slider
@ -157,7 +169,13 @@ Item
target: infillSlider
function onValueChanged()
{
// Don't round the value if it's already the same
if (infillSlider.ignoreValueChange)
{
infillSlider.ignoreValueChange = false
return
}
// Don't update if the setting value, if the slider has the same value
if (parseInt(infillDensity.properties.value) == infillSlider.value)
{
return