Commit ff80865a authored by Gus Grubba's avatar Gus Grubba

Move fly view away from background and into main window. The size different...

Move fly view away from background and into main window. The size different was causing the map not to match the one in plan view.
parent 0a2d20ae
...@@ -75,7 +75,7 @@ ApplicationWindow { ...@@ -75,7 +75,7 @@ ApplicationWindow {
settingsWindow.visible = false settingsWindow.visible = false
setupWindow.visible = false setupWindow.visible = false
analyzeWindow.visible = false analyzeWindow.visible = false
rootBackground.visible = false flightView.visible = false
planViewLoader.visible = false planViewLoader.visible = false
if(isPlanView) { if(isPlanView) {
toolbar.source = _planToolbar toolbar.source = _planToolbar
...@@ -86,7 +86,7 @@ ApplicationWindow { ...@@ -86,7 +86,7 @@ ApplicationWindow {
function showFlyView() { function showFlyView() {
viewSwitch(false) viewSwitch(false)
rootBackground.visible = true flightView.visible = true
} }
function showPlanView() { function showPlanView() {
...@@ -257,17 +257,6 @@ ApplicationWindow { ...@@ -257,17 +257,6 @@ ApplicationWindow {
background: Item { background: Item {
id: rootBackground id: rootBackground
anchors.fill: parent anchors.fill: parent
FlightDisplayView {
id: flightView
anchors.fill: parent
//-----------------------------------------------------------------
//-- Loader helper for any child, no matter how deep, to display
// elements on top of the fly (video) window.
Loader {
id: rootVideoLoader
anchors.centerIn: parent
}
}
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
...@@ -297,6 +286,20 @@ ApplicationWindow { ...@@ -297,6 +286,20 @@ ApplicationWindow {
} }
} }
//-------------------------------------------------------------------------
//-- Fly View
FlightDisplayView {
id: flightView
anchors.fill: parent
//-----------------------------------------------------------------
//-- Loader helper for any child, no matter how deep, to display
// elements on top of the fly (video) window.
Loader {
id: rootVideoLoader
anchors.centerIn: parent
}
}
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//-- Plan View //-- Plan View
Loader { Loader {
......
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