Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment

This commit is contained in:
ChrisTerBeke 2017-09-28 09:16:52 +02:00
commit f2e362838e

View File

@ -226,7 +226,7 @@ Item
Repeater Repeater
{ {
id: qualityRepeater id: qualityRepeater
model: qualityModel.availableTotalTicks > 0 ? qualityModel : 0 model: qualityModel.totalTicks > 0 ? qualityModel : 0
Rectangle Rectangle
{ {
@ -254,7 +254,8 @@ Item
id: qualitySlider id: qualitySlider
height: UM.Theme.getSize("sidebar_margin").height height: UM.Theme.getSize("sidebar_margin").height
anchors.bottom: speedSlider.bottom anchors.bottom: speedSlider.bottom
visible: qualityModel.availableTotalTicks > 0 enabled: qualityModel.availableTotalTicks > 0
visible: qualityModel.totalTicks > 0
updateValueWhileDragging : false updateValueWhileDragging : false
minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0 minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0