3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.2' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-07-22 16:15:01 +02:00
commit 822181f214
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/ObjectSelector.qml
View file

@ -105,7 +105,12 @@ Item
// We use an extra property here, since we only want to to be informed about the content size changes.
onContentHeightChanged:
{
scroll.height = Math.min(contentHeight, maximumHeight) + scroll.topPadding + scroll.bottomPadding
// It can sometimes happen that (due to animations / updates) the contentHeight is -1.
// This can cause a bunch of updates to trigger oneother, leading to a weird loop.
if(contentHeight >= 0)
{
scroll.height = Math.min(contentHeight, maximumHeight) + scroll.topPadding + scroll.bottomPadding
}
}
Component.onCompleted:
@ -116,10 +121,15 @@ Item
delegate: ObjectItemButton
{
id: modelButton
Binding
{
target: modelButton
property: "checked"
value: model.selected
}
text: model.name
width: listView.width
checked: model.selected
}
}
}