Merge lp:~ibelieve/ubuntu-filemanager-app/fixed-path-entry into lp:ubuntu-filemanager-app

Proposed by Michael Spencer
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 42
Merged at revision: 43
Proposed branch: lp:~ibelieve/ubuntu-filemanager-app/fixed-path-entry
Merge into: lp:ubuntu-filemanager-app
Diff against target: 50 lines (+17/-17)
1 file modified
PlacesPopover.qml (+17/-17)
To merge this branch: bzr merge lp:~ibelieve/ubuntu-filemanager-app/fixed-path-entry
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+173613@code.launchpad.net

Commit message

Moved the path entry field to the top of the popover

Description of the change

Moved path entry field to the top of the popover so the keyboard doesn't cover it.

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

Approved, although to me this seems like platform bug.

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 'PlacesPopover.qml'
2--- PlacesPopover.qml 2013-07-03 15:03:19 +0000
3+++ PlacesPopover.qml 2013-07-08 22:28:21 +0000
4@@ -63,23 +63,6 @@
5 top: parent.top
6 }
7
8- Repeater {
9- id: placesList
10- objectName: "placesList"
11-
12- model: places
13-
14- delegate: Standard {
15- text: folderName(path)
16- icon: model.icon || fileIcon(model.path, true)
17-
18- onClicked: {
19- PopupUtils.close(root)
20- goTo(model.path)
21- }
22- }
23- }
24-
25 Empty {
26
27 TextField {
28@@ -133,5 +116,22 @@
29 }
30 }
31 }
32+
33+ Repeater {
34+ id: placesList
35+ objectName: "placesList"
36+
37+ model: places
38+
39+ delegate: Standard {
40+ text: folderName(path)
41+ icon: model.icon || fileIcon(model.path, true)
42+
43+ onClicked: {
44+ PopupUtils.close(root)
45+ goTo(model.path)
46+ }
47+ }
48+ }
49 }
50 }

Subscribers

People subscribed via source and target branches