mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-28 05:11:04 -07:00
Merge branch 'feature_hide_gradual_infill' into 3.0
This commit is contained in:
commit
07899ba798
1 changed files with 3 additions and 2 deletions
|
|
@ -371,7 +371,7 @@ Item
|
||||||
{
|
{
|
||||||
id: infillCellRight
|
id: infillCellRight
|
||||||
|
|
||||||
height: infillSlider.height + enableGradualInfillCheckBox.height + (UM.Theme.getSize("sidebar_margin").height * 2)
|
height: infillSlider.height + UM.Theme.getSize("sidebar_margin").height + enableGradualInfillCheckBox.visible * (enableGradualInfillCheckBox.height + UM.Theme.getSize("sidebar_margin").height)
|
||||||
width: UM.Theme.getSize("sidebar").width * .55
|
width: UM.Theme.getSize("sidebar").width * .55
|
||||||
|
|
||||||
anchors.left: infillCellLeft.right
|
anchors.left: infillCellLeft.right
|
||||||
|
|
@ -531,6 +531,7 @@ Item
|
||||||
|
|
||||||
style: UM.Theme.styles.checkbox
|
style: UM.Theme.styles.checkbox
|
||||||
enabled: base.settingsEnabled
|
enabled: base.settingsEnabled
|
||||||
|
visible: infillSteps.properties.enabled == "True"
|
||||||
checked: parseInt(infillSteps.properties.value) > 0
|
checked: parseInt(infillSteps.properties.value) > 0
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|
@ -873,7 +874,7 @@ Item
|
||||||
id: infillSteps
|
id: infillSteps
|
||||||
containerStackId: Cura.MachineManager.activeStackId
|
containerStackId: Cura.MachineManager.activeStackId
|
||||||
key: "gradual_infill_steps"
|
key: "gradual_infill_steps"
|
||||||
watchedProperties: ["value"]
|
watchedProperties: ["value", "enabled"]
|
||||||
storeIndex: 0
|
storeIndex: 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue