Browse Source

SettingItem now uses settingInheritanceManager for visibility check

CURA-2361
Jaime van Kessel 8 years ago
parent
commit
e3d78c17ea
1 changed files with 3 additions and 13 deletions
  1. 3 13
      resources/qml/Settings/SettingItem.qml

+ 3 - 13
resources/qml/Settings/SettingItem.qml

@@ -196,19 +196,9 @@ Item {
                 // - This setting item uses inherit button at all
                 // - 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;
                 width: height;