Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2

This commit is contained in:
Wayne Chen 2018-11-07 14:21:13 -08:00
commit a05d70cd8b

View file

@ -129,8 +129,21 @@ Windows.ScrollingWindow {
height: pane.scrollHeight
width: pane.contentWidth
anchors.left: parent.left
anchors.top: parent.top
// this might be looking not clear from the first look
// but loader.parent is not tabletRoot and it can be null!
// unfortunately we can't use conditional bindings here due to https://bugreports.qt.io/browse/QTBUG-22005
onParentChanged: {
if (parent) {
anchors.left = Qt.binding(function() { return parent.left })
anchors.top = Qt.binding(function() { return parent.top })
} else {
anchors.left = undefined
anchors.top = undefined
}
}
signal loaded;
onWidthChanged: {