Skip to content

Q
qgroundcontrol
Commit d8f34f39 authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files
Options

merge with remote master

parent eb694b02
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ d8f34f39
...@@ -510,18 +510,18 @@ QGCView { ...@@ -510,18 +510,18 @@ QGCView {
} }
} }
// FlightDisplayViewWidgets { FlightDisplayViewWidgets {
// id: flightDisplayViewWidgets id: flightDisplayViewWidgets
// z: _panel.z + 4 z: _panel.z + 4
// height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
// anchors.left: parent.left anchors.left: parent.left
// anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
// anchors.bottom: parent.bottom anchors.bottom: parent.bottom
// qgcView: root qgcView: root
// useLightColors: isBackgroundDark useLightColors: isBackgroundDark
// missionController: _missionController missionController: _missionController
// visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
// } }
FlightDisplayWimaMenu { FlightDisplayWimaMenu {
id: wimaMenu id: wimaMenu
......
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