Browse Source

Merge pull request #1610 from DonLakeFlyer/QGCViewOnComplete

completed signaled too early on QGCView
QGC4.4
Don Gagne 10 years ago
parent
commit
85ad9e0974
  1. 16
      src/QmlControls/QGCView.qml

16
src/QmlControls/QGCView.qml

@ -37,6 +37,8 @@ import QGroundControl.FactControls 1.0 @@ -37,6 +37,8 @@ import QGroundControl.FactControls 1.0
FactPanel {
id: __rootItem
property bool __completedSignalled: false
property Component viewComponent
/// This is signalled when the top level Item reaches Component.onCompleted. This allows
@ -164,7 +166,19 @@ FactPanel { @@ -164,7 +166,19 @@ FactPanel {
property Component __dialogComponent
Component.onCompleted: completed()
function __signalCompleted() {
// When we use this control inside a QGCQmlWidgetHolder Component.onCompleted is signalled
// before the width and height are adjusted. So we need to wait for width and heigth to be
// set before we signal our own completed signal.
if (!__completedSignalled && width != 0 && height != 0) {
__completedSignalled = true
completed()
}
}
Component.onCompleted: __signalCompleted()
onWidthChanged: __signalCompleted()
onHeightChanged: __signalCompleted()
Connections {
target: __viewPanel.item

Loading…
Cancel
Save