Commit 68886a1a authored by Don Gagne's avatar Don Gagne

Fix passed in property mechanism

qgcView was coming through null causing widget dialog to not pop up
parent 01806fae
...@@ -219,15 +219,14 @@ QGCView { ...@@ -219,15 +219,14 @@ QGCView {
} }
FlightDisplayViewWidgets { FlightDisplayViewWidgets {
id: flightDisplayViewWidgets id: flightDisplayViewWidgets
z: _panel.z + 4 z: _panel.z + 4
height: ScreenTools.availableHeight height: ScreenTools.availableHeight
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
qgcView: root
property bool isBackgroundDark: root.isBackgroundDark isBackgroundDark: root.isBackgroundDark
property var qgcView: root
} }
//-- Virtual Joystick //-- Virtual Joystick
......
...@@ -25,8 +25,10 @@ import QGroundControl.FlightMap 1.0 ...@@ -25,8 +25,10 @@ import QGroundControl.FlightMap 1.0
Item { Item {
id: _root id: _root
property alias guidedModeBar: _guidedModeBar property alias guidedModeBar: _guidedModeBar
property bool gotoEnabled: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying property bool gotoEnabled: _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
property var qgcView
property bool isBackgroundDark
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool _isSatellite: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true property bool _isSatellite: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
...@@ -87,7 +89,7 @@ Item { ...@@ -87,7 +89,7 @@ Item {
airSpeedFact: _airSpeedFact airSpeedFact: _airSpeedFact
lightBorders: _lightWidgetBorders lightBorders: _lightWidgetBorders
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
qgcView: parent.parent.qgcView qgcView: _root.qgcView
maxHeight: parent.height - (anchors.margins * 2) maxHeight: parent.height - (anchors.margins * 2)
} }
...@@ -113,7 +115,7 @@ Item { ...@@ -113,7 +115,7 @@ Item {
anchors.top: instrumentGadgetAlternate.bottom anchors.top: instrumentGadgetAlternate.bottom
anchors.horizontalCenter: instrumentGadgetAlternate.horizontalCenter anchors.horizontalCenter: instrumentGadgetAlternate.horizontalCenter
width: getGadgetWidth() width: getGadgetWidth()
qgcView: parent.parent.qgcView qgcView: _root.qgcView
textColor: _isSatellite ? "white" : "black" textColor: _isSatellite ? "white" : "black"
visible: _useAlternateInstruments visible: _useAlternateInstruments
maxHeight: virtualJoystickMultiTouch.visible ? virtualJoystickMultiTouch.y - y : parent.height - anchors.margins - y maxHeight: virtualJoystickMultiTouch.visible ? virtualJoystickMultiTouch.y - y : parent.height - anchors.margins - y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment