3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 12:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Don't show inheritance icon for resovled values

Browse source 
CURA-2860
This commit is contained in:
Jaime van Kessel 2016-11-23 12:41:53 +01:00
parent e17eda9a33
commit 716ffe94ff
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/qml/Settings/SettingItem.qml
View file

@ -209,14 +209,26 @@ Item {
// But this will cause the binding to be re-evaluated when the enabled property changes. // But this will cause the binding to be re-evaluated when the enabled property changes.
return false; return false;
} }
// There are no settings with any warning.
if(Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length == 0) if(Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length == 0)
{ {
return false; return false;
} }
// This setting has a resolve value, so an inheritance warning doesn't do anything.
if(resolve != "None")
{
return false
}
// If the setting does not have a limit_to_extruder property (or is -1), use the active stack.
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1) if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{ {
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0; return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
} }
// Setting does have a limit_to_extruder property, so use that one instead.
return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, globalPropertyProvider.properties.limit_to_extruder).indexOf(definition.key) >= 0; return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, globalPropertyProvider.properties.limit_to_extruder).indexOf(definition.key) >= 0;
} }