Fix tilt when navigating setting

otsaloma · Jul 16, 2018 · be35626 · be35626
1 parent e397f98
commit be35626
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/qml/Map.qml b/qml/Map.qml
@@ -30,7 +30,7 @@ MapboxMap {
     cacheDatabaseDefaultPath: true
     cacheDatabaseStoreSettings: false
     center: QtPositioning.coordinate(49, 13)
-    pitch: app.navigationActive && format !== "raster" ? 60 : 0
+    pitch: app.navigationActive && format !== "raster" && tiltEnabled ? 60 : 0
     pixelRatio: Theme.pixelRatio * 1.5
     zoomLevel: 4.0
 
@@ -49,6 +49,7 @@ MapboxMap {
     property var    position: gps.position
     property bool   ready: false
     property var    route: {}
+    property bool   tiltEnabled: false
 
     readonly property var images: QtObject {
         readonly property string pixel: "whogo-image-pixel"
@@ -218,6 +219,7 @@ MapboxMap {
         map.centerOnPosition();
         map.autoCenter = true;
         map.autoRotate = true;
+        map.tiltEnabled = app.conf.get("tilt_when_navigating");
         map.initVoiceNavigation();
         app.navigationActive = true;
         app.navigationPageSeen = true;
@@ -300,6 +302,7 @@ MapboxMap {
         // Restore UI from navigation mode.
         map.autoCenter = false;
         map.autoRotate = false;
+        map.tiltEnabled = app.conf.get("tilt_when_navigating");
         map.zoomLevel > 14 && map.setZoomLevel(14);
         app.navigationActive = false;
     }

diff --git a/qml/PreferencesPage.qml b/qml/PreferencesPage.qml
@@ -43,6 +43,7 @@ Page {
                 text: app.tr("Tilt map when navigating")
                 onCheckedChanged: {
                     app.conf.set("tilt_when_navigating", tiltSwitch.checked);
+                    map.tiltEnabled = tiltSwitch.checked;
                 }
             }