diff options
| author | <philippe colliot> | 2014-10-20 09:03:07 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-10-20 09:03:07 +0200 |
| commit | dcf981a6b9997792a526e5710a4e067245adcd60 (patch) | |
| tree | 5738a0ab005b55a419c141cfc27750de1baf87d5 | |
| parent | 1dd6909bdbd453b6edc661d5dfae5b074f6c7684 (diff) | |
| download | navigation-dcf981a6b9997792a526e5710a4e067245adcd60.tar.gz | |
fix a missing test for ilmready_for_yocto_migration
| -rw-r--r-- | src/hmi/qml/NavigationBrowseMap.qml | 18 | ||||
| -rw-r--r-- | src/hmi/qml/application.qml | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml index 378592f..7954cc0 100644 --- a/src/hmi/qml/NavigationBrowseMap.qml +++ b/src/hmi/qml/NavigationBrowseMap.qml @@ -412,7 +412,8 @@ HMIMenu { { if (!split.disabled) { disconnectSignals(); - hideSurfaces(); + if (Genivi.g_layer_manager == true) + hideSurfaces(); pageOpen("NavigationCalculatedRoute"); } } @@ -554,7 +555,8 @@ HMIMenu { explode: false onClicked: { disconnectSignals(); - hideSurfaces(); + if (Genivi.g_layer_manager == true) + hideSurfaces(); pageOpen("POI"); } } @@ -596,7 +598,8 @@ HMIMenu { id:menub; text:Genivi.gettext("Menu"); next:orientation; prev:settings; onClicked: { disconnectSignals(); - hideSurfaces(); + if (Genivi.g_layer_manager == true) + hideSurfaces(); pageOpen("MainMenu"); } } @@ -667,7 +670,8 @@ HMIMenu { id:settings; explode:false; next:menub; prev:zoomout; onClicked: { disconnectSignals(); - hideSurfaces(); + if (Genivi.g_layer_manager == true) + hideSurfaces(); pageOpen("CameraSettings"); } } @@ -763,7 +767,8 @@ HMIMenu { if (res[0] == "uint16") { if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) { disconnectSignals(); - hideSurfaces(); + if (Genivi.g_layer_manager == true) + hideSurfaces(); pageOpen("NavigationManeuversList"); } } @@ -995,7 +1000,8 @@ HMIMenu { Component.onCompleted: { Genivi.map_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP); - showSurfaces(); + if (Genivi.g_layer_manager == true) + showSurfaces(); if (Genivi.data['show_route_handle']) { Genivi.mapviewercontrol_message(dbusIf, "DisplayRoute", Genivi.data['show_route_handle'].concat("boolean",false)); delete(Genivi.data['show_route_handle']); diff --git a/src/hmi/qml/application.qml b/src/hmi/qml/application.qml index 5c78800..ec699dc 100644 --- a/src/hmi/qml/application.qml +++ b/src/hmi/qml/application.qml @@ -36,7 +36,7 @@ import "Core/genivi.js" as Genivi; ApplicationWindow { id: container - visible: true + visible: true width: StyleSheetMap.menu[Constants.WIDTH]; height: StyleSheetMap.menu[Constants.HEIGHT]; property Item layer_manager; |