Merge lp:~ajalkane/ubuntu-filemanager-app/showing-path into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/showing-path
Merge into: lp:ubuntu-filemanager-app
Diff against target: 43 lines (+15/-2)
1 file modified
FolderListPage.qml (+15/-2)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/showing-path
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+161829@code.launchpad.net

Commit message

Showing path

Description of the change

Showing path

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

Ugly, but needed.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'FolderListPage.qml'
--- FolderListPage.qml 2013-04-23 17:31:17 +0000
+++ FolderListPage.qml 2013-05-01 14:33:26 +0000
@@ -22,7 +22,7 @@
2222
23Page {23Page {
24 id: root24 id: root
25 anchors.margins: units.gu(2)25 anchors.fill: parent
2626
27 FolderListModel {27 FolderListModel {
28 id: pageModel28 id: pageModel
@@ -47,6 +47,7 @@
47 }47 }
4848
49 tools: ToolbarActions {49 tools: ToolbarActions {
50 id: toolbar
50 lock: true51 lock: true
51 active: true52 active: true
5253
@@ -111,9 +112,21 @@
111112
112 FolderListView {113 FolderListView {
113 id: folderListView114 id: folderListView
115 header: Label {
116 text: pageModel.path
117 fontSize: "large"
118 }
119
120 clip: true
114121
115 folderListModel: pageModel122 folderListModel: pageModel
116 anchors.fill: parent 123 anchors.fill: parent
124 // IMPROVE: this should work (?), but it doesn't. Height is undefined. Anyway in previous
125 // SDK version the parent size was properly initialized. Now the size of toolbar is not taken into
126 // account and apparently you can't even query toolbar's height.
127 // anchors.bottomMargin: toolbar.height
128 // So hard-code it. Not nice at all:
129 anchors.bottomMargin: units.gu(8)
117 }130 }
118131
119 // Errors from model132 // Errors from model

Subscribers

People subscribed via source and target branches