Merge lp:~vthompson/ubuntu-filemanager-app/fix-1272160 into lp:ubuntu-filemanager-app

Proposed by Victor Thompson
Status: Merged
Approved by: Michael Spencer
Approved revision: 118
Merged at revision: 118
Proposed branch: lp:~vthompson/ubuntu-filemanager-app/fix-1272160
Merge into: lp:ubuntu-filemanager-app
Diff against target: 20 lines (+3/-1)
1 file modified
ubuntu-filemanager-app.qml (+3/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-filemanager-app/fix-1272160
Reviewer Review Type Date Requested Status
Michael Spencer Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+204330@code.launchpad.net

Commit message

* Change app behavior to default to phone mode and transition to tablet mode when app is loaded.

Description of the change

This MP prevents the app from initially showing the side bar in phone mode, thus fixing the bug that caused the item heights to sometimes differ. This introduces a visible transition when in tablet mode (running on desktop, for instance) but that does not cause the item height issue due to the width of the app.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michael Spencer (ibelieve) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-filemanager-app.qml'
2--- ubuntu-filemanager-app.qml 2013-12-07 18:33:52 +0000
3+++ ubuntu-filemanager-app.qml 2014-01-31 19:43:17 +0000
4@@ -39,7 +39,8 @@
5
6 property alias filemanager: root
7
8- property bool wideAspect: width >= units.gu(80)
9+ property bool wideAspect: width >= units.gu(80) && loaded
10+ property bool loaded: false
11
12 headerColor: "#464646"
13 backgroundColor: "#797979"
14@@ -78,6 +79,7 @@
15 pageStack.push(tabs)
16 pageStack.push(settingsPage)
17 pageStack.pop()
18+ loaded = true
19 }
20 }
21

Subscribers

People subscribed via source and target branches