GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

SettingItem now uses settingInheritanceManager for visibility check

Browse Source 
CURA-2361
This commit is contained in:
Jaime van Kessel 2016-09-16 11:22:50 +02:00
parent e282e35b9c
commit e3d78c17ea
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,17 +197,7 @@ Item {
// - The type of the value of any deeper container is an "object" (eg; is a function)
visible:
{
var state = base.state == "InstanceState.User";
var has_setting_function = false;
for (var i = 1; i < base.stackLevels.length; i++)
{
has_setting_function = typeof(propertyProvider.getPropertyValue("value", base.stackLevels[i])) == "object";
if(has_setting_function)
{
break;
}
}
return state && base.showInheritButton && has_setting_function && typeof(propertyProvider.getPropertyValue("value", base.stackLevels[0])) != "object"
return showInheritButton && Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
}
height: parent.height;