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

Fix qml binding loops

Browse Source
This commit is contained in:
fieldOfView 2017-10-30 12:26:02 +01:00
parent 84002a70d0
commit 6fa4dd0a97
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/MonitorButton.qml
View File

@ -188,7 +188,11 @@ Item
Item { Item {
id: buttonsRow id: buttonsRow
height: abortButton.height height: abortButton.height
width: Math.min(childrenRect.width, base.width - 2 * UM.Theme.getSize("sidebar_margin").width) width: {
// using childrenRect.width directly causes a binding loop, because setting the width affects the childrenRect
var children_width = additionalComponentsRow.width + pauseResumeButton.width + abortButton.width + 3 * UM.Theme.getSize("default_margin").width;
return Math.min(children_width, base.width - 2 * UM.Theme.getSize("sidebar_margin").width);
}
anchors.top: progressBar.bottom anchors.top: progressBar.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.right: parent.right anchors.right: parent.right

16
resources/qml/SaveButton.qml
View File

@ -91,7 +91,19 @@ Item {
Item { Item {
id: saveRow id: saveRow
width: Math.min(childrenRect.width + UM.Theme.getSize("sidebar_margin").width, base.width - UM.Theme.getSize("sidebar_margin").width) width: {
// using childrenRect.width directly causes a binding loop, because setting the width affects the childrenRect
var children_width = UM.Theme.getSize("default_margin").width;
for (var index in children)
{
var child = children[index];
if(child.visible)
{
children_width += child.width + child.anchors.rightMargin;
}
}
return Math.min(children_width, base.width - UM.Theme.getSize("sidebar_margin").width);
}
height: saveToButton.height height: saveToButton.height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
@ -102,7 +114,7 @@ Item {
id: additionalComponentsRow id: additionalComponentsRow
anchors.top: parent.top anchors.top: parent.top
anchors.right: saveToButton.visible ? saveToButton.left : parent.right anchors.right: saveToButton.visible ? saveToButton.left : parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
} }