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
1=== modified file 'FolderListPage.qml'
2--- FolderListPage.qml 2013-04-23 17:31:17 +0000
3+++ FolderListPage.qml 2013-05-01 14:33:26 +0000
4@@ -22,7 +22,7 @@
5
6 Page {
7 id: root
8- anchors.margins: units.gu(2)
9+ anchors.fill: parent
10
11 FolderListModel {
12 id: pageModel
13@@ -47,6 +47,7 @@
14 }
15
16 tools: ToolbarActions {
17+ id: toolbar
18 lock: true
19 active: true
20
21@@ -111,9 +112,21 @@
22
23 FolderListView {
24 id: folderListView
25+ header: Label {
26+ text: pageModel.path
27+ fontSize: "large"
28+ }
29+
30+ clip: true
31
32 folderListModel: pageModel
33- anchors.fill: parent
34+ anchors.fill: parent
35+ // IMPROVE: this should work (?), but it doesn't. Height is undefined. Anyway in previous
36+ // SDK version the parent size was properly initialized. Now the size of toolbar is not taken into
37+ // account and apparently you can't even query toolbar's height.
38+ // anchors.bottomMargin: toolbar.height
39+ // So hard-code it. Not nice at all:
40+ anchors.bottomMargin: units.gu(8)
41 }
42
43 // Errors from model

Subscribers

People subscribed via source and target branches