mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-23 22:54:01 -06:00
Bed temperature is now either a resolved value or a global value.
Contributes to CURA-2007
This commit is contained in:
parent
aba027373b
commit
2402ba3d0e
6 changed files with 34 additions and 5 deletions
|
@ -106,7 +106,16 @@ SettingItem
|
|||
{
|
||||
target: input
|
||||
property: "text"
|
||||
value: propertyProvider.properties.value
|
||||
value: {
|
||||
if (propertyProvider.properties.resolve != "None") {
|
||||
// We have a resolve function. Indicates that the setting is not settable per extruder and that
|
||||
// we have to choose between the resolved value (default) and the global value
|
||||
// (if user has explicitly set this).
|
||||
return (globalPropertyProvider.properties.value != null) ? globalPropertyProvider.properties.value : propertyProvider.properties.resolve;
|
||||
} else {
|
||||
return propertyProvider.properties.value;
|
||||
}
|
||||
}
|
||||
when: !input.activeFocus
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue