1 files changed, 35 insertions, 7 deletions

diff --git a/apps/com.pelagicore.map/panels/MapHeaderPanel.qml b/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
index 052b669d..b9c4c66d 100644
--- a/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
+++ b/apps/com.pelagicore.map/panels/MapHeaderPanel.qml
@@ -78,6 +78,7 @@ Item {
         anchors.top: parent.top
         anchors.topMargin: Sizes.dp(210)
         active: root.neptuneWindowState === "Maximized"
+        opacity: root.state === "demo_driving" ? 0.6 : 1.0
         sourceComponent: HeaderBackgroundMaximizedPanel {
             state: root.state
             destinationButtonrowHeight: root.destinationButtonrowHeight
@@ -90,7 +91,7 @@ Item {
         height: headerBackgroundFullscreen.height
         active: root.neptuneWindowState === "Maximized" && root.state === "initial"
         anchors.top: headerBackgroundFullscreen.top
-        anchors.topMargin: Sizes.dp(112)
+        anchors.topMargin: Sizes.dp(50)
         anchors.horizontalCenter: headerBackgroundFullscreen.horizontalCenter
         sourceComponent: NavigationSearchPanel {
             offlineMapsEnabled: root.offlineMapsEnabled
@@ -120,7 +121,7 @@ Item {
     Loader {
         id: favoriteDestinationButtonsFullscreen
         anchors.top: headerBackgroundFullscreen.top
-        anchors.topMargin: headerBackgroundFullscreen.height - height
+        anchors.topMargin: Sizes.dp(164)
         anchors.left: headerBackgroundFullscreen.left
         anchors.leftMargin: Sizes.dp(45)
         anchors.right: headerBackgroundFullscreen.right
@@ -144,19 +145,24 @@ Item {
         anchors.right: parent.right
         anchors.top: parent.top
         active: (root.neptuneWindowState === "Widget2Rows"
-                    || root.neptuneWindowState === "Widget3Rows")
-                && (root.state === "initial" || root.state === "destination_selection")
+                    || root.neptuneWindowState === "Widget3Rows"
+                    || root.neptuneWindowState === "Widget1Row")
+        opacity: root.neptuneWindowState === "Widget1Row" || root.state === "demo_driving"
+                 ? 0.6 : 1.0
         sourceComponent: HeaderBackgroundWidgetPanel {
             neptuneWindowState: root.neptuneWindowState
+            state: root.state
         }
     }
 
     Loader {
         id: navigationSearchButtonsWidget
-        width: headerBackgroundWidget.width - Sizes.dp(184) // compensate for the "expand" button in the widget corner
+        // - Sizes.dp(160) compensates the "expand" button in the widget corner
+        width: headerBackgroundWidget.width - Sizes.dp(160)
         active: (root.neptuneWindowState === "Widget2Rows"
-                    || root.neptuneWindowState === "Widget3Rows")
-                && (root.state === "initial" || root.state === "destination_selection")
+                    || root.neptuneWindowState === "Widget3Rows"
+                    || root.neptuneWindowState === "Widget1Row")
+                && root.state === "initial"
         anchors.top: headerBackgroundWidget.top
         anchors.topMargin: Sizes.dp(48)
         anchors.horizontalCenter: headerBackgroundWidget.horizontalCenter
@@ -167,6 +173,28 @@ Item {
     }
 
     Loader {
+        id: navigationConfirmButtonsWidget
+        // - Sizes.dp(60) compensates the "expand" button in the widget corner
+        width: headerBackgroundWidget.width - Sizes.dp(60)
+        active: (root.neptuneWindowState !== "Maximized")
+                && (root.state === "route_selection"
+                    || root.state === "destination_selection"
+                    || root.state === "demo_driving")
+        anchors.top: headerBackgroundWidget.top
+        anchors.topMargin: Sizes.dp(48)
+        sourceComponent: NavigationConfirmPanel {
+            state: root.state
+            neptuneWindowState: root.neptuneWindowState
+            destination: root.destination
+            routeDistance: root.routeDistance
+            routeTime: root.routeTime
+            onStartNavigation: root.startNavigation()
+            onShowRoute: root.showRoute()
+            onStopNavigation: root.stopNavigation()
+        }
+    }
+
+    Loader {
         id: favoriteDestinationButtonsWidget
         anchors.top: headerBackgroundWidget.top
         anchors.topMargin: Sizes.dp(130)