uNav

Merge lp:~joergberroth/unav/fixHeader_returningFromRouteInfoList into lp:unav

  1. fixHeader_returningFromRouteInfoList
  2. Merge into trunk
Proposed by JkB
Status: Merged
Merged at revision: 90
Proposed branch: lp:~joergberroth/unav/fixHeader_returningFromRouteInfoList
Merge into: lp:unav
Prerequisite: lp:~joergberroth/unav/fixFirstIcon
Diff against target: 23 lines (+1/-1)
2 files modified
qml/Main.qml (+0/-1)
qml/RouteInfoListPage.qml (+1/-0)
To merge this branch: bzr merge lp:~joergberroth/unav/fixHeader_returningFromRouteInfoList
Reviewer Review Type Date Requested Status
costales Approve
Review via email: mp+300244@code.launchpad.net

Commit message

*fix Header behaviour when returning from RouteInfoListPage.qml and headerVisible is set to false

Description of the change

*fix Header behaviour when returning from RouteInfoListPage.qml and headerVisible is set to false

To post a comment you must log in.
Revision history for this message
costales (costales) wrote :

Great :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Main.qml'
2--- qml/Main.qml 2016-07-15 15:01:08 +0000
3+++ qml/Main.qml 2016-07-15 19:53:16 +0000
4@@ -300,7 +300,6 @@
5 case "http://get_routeinfo_list/":
6 var dec_routeList = decodeURIComponent(url[1]);
7 mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("RouteInfoListPage.qml"), { routeList: JSON.parse(dec_routeList) });
8- navApp.settings.headerVisible = true;
9 break;
10
11 case "http://route_status/":
12
13=== modified file 'qml/RouteInfoListPage.qml'
14--- qml/RouteInfoListPage.qml 2016-05-05 19:21:33 +0000
15+++ qml/RouteInfoListPage.qml 2016-07-15 19:53:16 +0000
16@@ -37,6 +37,7 @@
17 // Hide 2nd column when returning to the map to avoid an empty white column
18 if (mainPageStack.columns === 1)
19 mainPageStack.hideSideBar()
20+ header.visible = navApp.settings.headerVisible
21 }
22
23 ListModel {

Subscribers

People subscribed via source and target branches