3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed behaviour of inheritance button

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-06-08 14:58:05 +02:00
parent 6a2be5a34a
commit 3881ed8a61
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,8 @@ Item {
// Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
property var state: propertyProvider.properties.state property var state: propertyProvider.properties.state
property var stackLevel: propertyProvider.stackLevels[0] property var stackLevels: propertyProvider.stackLevels
property var stackLevel: stackLevels[0]
signal contextMenuRequested() signal contextMenuRequested()
signal showTooltip(string text); signal showTooltip(string text);
@ -159,7 +160,7 @@ Item {
id: inheritButton; id: inheritButton;
//visible: has_profile_value && base.has_inherit_function && base.is_enabled //visible: has_profile_value && base.has_inherit_function && base.is_enabled
visible: base.state == "InstanceState.User" && base.stackLevel > 0 && base.showInheritButton visible: base.state == "InstanceState.User" && base.showInheritButton
height: parent.height; height: parent.height;
width: height; width: height;
@ -175,6 +176,7 @@ Item {
// needed for the reset button (which deletes the top value) to correctly go back to profile // needed for the reset button (which deletes the top value) to correctly go back to profile
// defaults. // defaults.
propertyProvider.setPropertyValue("value", propertyProvider.getPropertyValue("value", last_entry)) propertyProvider.setPropertyValue("value", propertyProvider.getPropertyValue("value", last_entry))
propertyProvider.setPropertyValue("state", "InstanceState.Calculated")
} }
backgroundColor: UM.Theme.getColor("setting_control"); backgroundColor: UM.Theme.getColor("setting_control");