mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-12 22:38:04 +08:00
Merge branch 'master' of github.com:Ultimaker/Cura
This commit is contained in:
commit
c56d135b15
@ -98,7 +98,14 @@ Item
|
|||||||
|
|
||||||
// Set selected value
|
// Set selected value
|
||||||
if (Cura.MachineManager.activeQualityType == qualityItem.metadata.quality_type) {
|
if (Cura.MachineManager.activeQualityType == qualityItem.metadata.quality_type) {
|
||||||
|
|
||||||
|
// set to -1 when switching to user created profile so all ticks are clickable
|
||||||
|
if (Cura.SimpleModeSettingsManager.isProfileUserCreated) {
|
||||||
|
qualityModel.qualitySliderActiveIndex = -1
|
||||||
|
} else {
|
||||||
qualityModel.qualitySliderActiveIndex = i
|
qualityModel.qualitySliderActiveIndex = i
|
||||||
|
}
|
||||||
|
|
||||||
qualityModel.existingQualityProfile = 1
|
qualityModel.existingQualityProfile = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -293,14 +300,12 @@ Item
|
|||||||
}
|
}
|
||||||
|
|
||||||
onValueChanged: {
|
onValueChanged: {
|
||||||
// Only change if an active machine is set and the slider is visible at all.
|
// only change if an active machine is set and the slider is visible at all.
|
||||||
if (Cura.MachineManager.activeMachine != null && visible)
|
if (Cura.MachineManager.activeMachine != null && visible) {
|
||||||
{
|
// prevent updating during view initializing. Trigger only if the value changed by user
|
||||||
//Prevent updating during view initializing. Trigger only if the value changed by user
|
if (qualitySlider.value != qualityModel.qualitySliderActiveIndex) {
|
||||||
if (qualitySlider.value != qualityModel.qualitySliderActiveIndex)
|
// start updating with short delay
|
||||||
{
|
qualitySliderChangeTimer.start()
|
||||||
//start updating with short delay
|
|
||||||
qualitySliderChangeTimer.start();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user