From 448cec020e66c5b84d8dba494d412342416dda55 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 3 Sep 2019 14:48:04 -0700 Subject: [PATCH] Move Log Replay bar to Window footer --- src/FlightDisplay/FlightDisplayView.qml | 15 ++------------- src/ui/MainRootWindow.qml | 6 +++++- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 172290b5c..c27ffd2a4 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -311,10 +311,7 @@ Item { Item { id: _mapAndVideo - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: logReplayStatusBar.top + anchors.fill: parent //-- Map View Item { @@ -518,7 +515,7 @@ Item { anchors.left: parent.left anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.bottom: parent.bottom - anchors.top: singleMultiSelector.visible? singleMultiSelector.bottom:undefined + anchors.top: singleMultiSelector.visible? singleMultiSelector.bottom : undefined useLightColors: isBackgroundDark missionController: _missionController visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen @@ -751,14 +748,6 @@ Item { } } - LogReplayStatusBar { - id: logReplayStatusBar - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - visible: QGroundControl.settingsManager.flyViewSettings.showLogReplayStatusBar.rawValue &&_flightMapContainer.state === "fullMode" - } - //-- Airspace Indicator Rectangle { id: airspaceIndicator diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml index 3747877be..34f38cdb7 100644 --- a/src/ui/MainRootWindow.qml +++ b/src/ui/MainRootWindow.qml @@ -48,7 +48,7 @@ ApplicationWindow { property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property bool communicationLost: activeVehicle ? activeVehicle.connectionLost : false property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : "" - property real availableHeight: mainWindow.height - mainWindow.header.height + property real availableHeight: mainWindow.height - mainWindow.header.height - mainWindow.footer.height property var currentPlanMissionItem: planMasterControllerPlan ? planMasterControllerPlan.missionController.currentPlanViewItem : null property var planMasterControllerPlan: null @@ -268,6 +268,10 @@ ApplicationWindow { } } + footer: LogReplayStatusBar { + visible: QGroundControl.settingsManager.flyViewSettings.showLogReplayStatusBar.rawValue + } + //------------------------------------------------------------------------- //-- Fly View FlightDisplayView { -- 2.22.0