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

Moved some properties to bindings due to bug in qt 5.5.1

Browse source 
CURA-1494
This commit is contained in:
Jaime van Kessel 2016-06-07 12:50:57 +02:00
parent 0a84867132
commit 68837a089a
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,10 @@ Item {
property var showInheritButton: true property var showInheritButton: true
property var doDepthIdentation: true property var doDepthIdentation: true
// Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
property var state: propertyProvider.properties.state
property var stackLevel: propertyProvider.stackLevel
signal contextMenuRequested() signal contextMenuRequested()
signal showTooltip(string text); signal showTooltip(string text);
signal hideTooltip(); signal hideTooltip();
@ -128,7 +132,7 @@ Item {
{ {
id: revertButton; id: revertButton;
visible: propertyProvider.stackLevel == 0 && base.showRevertButton visible: base.stackLevel == 0 && base.showRevertButton
height: parent.height; height: parent.height;
width: height; width: height;
@ -155,14 +159,14 @@ 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: propertyProvider.properties.state == "InstanceState.User" && propertyProvider.stackLevel > 0 && base.showInheritButton visible: base.state == "InstanceState.User" && base.stackLevel > 0 && base.showInheritButton
height: parent.height; height: parent.height;
width: height; width: height;
onClicked: { onClicked: {
focus = true; focus = true;
propertyProvider.removeFromContainer(propertyProvider.stackLevel) propertyProvider.removeFromContainer(base.stackLevel)
} }
backgroundColor: UM.Theme.getColor("setting_control"); backgroundColor: UM.Theme.getColor("setting_control");