mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-09 06:45:09 -06:00
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view
This commit is contained in:
commit
ca8fa9cfac
4 changed files with 67 additions and 13 deletions
|
@ -18,6 +18,7 @@ Item
|
|||
height: childrenRect.height
|
||||
|
||||
property real labelColumnWidth: Math.round(width / 3)
|
||||
property var curaRecommendedMode: Cura.RecommendedMode {}
|
||||
|
||||
Cura.IconWithText
|
||||
{
|
||||
|
@ -64,19 +65,7 @@ Item
|
|||
|
||||
onClicked:
|
||||
{
|
||||
var adhesionType = "skirt";
|
||||
if (!parent.checked)
|
||||
{
|
||||
// Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
|
||||
platformAdhesionType.removeFromContainer(0);
|
||||
adhesionType = platformAdhesionType.properties.resolve;
|
||||
if(adhesionType === "skirt" || adhesionType === "none")
|
||||
{
|
||||
// If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
|
||||
adhesionType = "brim";
|
||||
}
|
||||
}
|
||||
platformAdhesionType.setPropertyValue("value", adhesionType);
|
||||
curaRecommendedMode.setAdhesion(!parent.checked)
|
||||
}
|
||||
|
||||
onEntered:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue