diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-04-25 12:27:22 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-04-25 12:27:22 +0200 |
| commit | 9524c507b6def7757c9a506afb0a2ac0b4790802 (patch) | |
| tree | 47931d250ff0b6efcd58bfb75e6263f0361aa321 | |
| parent | bb5bfc4cd872517045d2fd1342b2593be8a0b04c (diff) | |
| download | navigation-9524c507b6def7757c9a506afb0a2ac0b4790802.tar.gz | |
update navigation version and fix and error in zoom hmi
| -rwxr-xr-x | src/clone_and_build.sh | 2 | ||||
| -rw-r--r-- | src/hmi/qml/NavigationAppBrowseMap.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh index 9ce8bd6..dce740c 100755 --- a/src/clone_and_build.sh +++ b/src/clone_and_build.sh @@ -1,7 +1,7 @@ #!/bin/bash build_option="" -navigation_version='d475fb3b22d6dbc704f1208202f86a5393137537' +navigation_version='70e44b6b5df23d8a8708885f1f4f7ce90cb12fae' positioning_version='9725fe1f553197042d6445997690d452a73490c0' navit_version='995cec54c8682fbabfb4f912b6156ce0b5b43436' diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml index 1d7e384..61c2dcc 100644 --- a/src/hmi/qml/NavigationAppBrowseMap.qml +++ b/src/hmi/qml/NavigationAppBrowseMap.qml @@ -1015,7 +1015,7 @@ NavigationAppHMIMenu { source:StyleSheetBottom.zoomin[Constants.SOURCE]; x:StyleSheetBottom.zoomin[Constants.X]; y:StyleSheetBottom.zoomin[Constants.Y]; width:StyleSheetBottom.zoomin[Constants.WIDTH]; height:StyleSheetBottom.zoomin[Constants.HEIGHT]; id:zoomin; next:zoomout; prev:orientation; onClicked: { - if(currentZoomId>Genivi.minZoomId){ + if(currentZoomId<Genivi.maxZoomId){ Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1); } } @@ -1034,7 +1034,7 @@ NavigationAppHMIMenu { source:StyleSheetBottom.zoomout[Constants.SOURCE]; x:StyleSheetBottom.zoomout[Constants.X]; y:StyleSheetBottom.zoomout[Constants.Y]; width:StyleSheetBottom.zoomout[Constants.WIDTH]; height:StyleSheetBottom.zoomout[Constants.HEIGHT]; id:zoomout; next:settings; prev:zoomin; onClicked: { - if(currentZoomId<Genivi.maxZoomId){ + if(currentZoomId>Genivi.minZoomId){ Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1); } } |