Merge lp:~fboucault/camera-app/fix_header_flickering_arale into lp:camera-app

Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 552
Merged at revision: 552
Proposed branch: lp:~fboucault/camera-app/fix_header_flickering_arale
Merge into: lp:camera-app
Diff against target: 19 lines (+2/-0)
1 file modified
camera-app.qml (+2/-0)
To merge this branch: bzr merge lp:~fboucault/camera-app/fix_header_flickering_arale
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+257359@code.launchpad.net

Commit message

Do not render camera when in photo roll and vice-versa.

Aside from performance improvement, this works around a bug specific to arale where the photo roll header is visible on top of the share popover.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'camera-app.qml'
2--- camera-app.qml 2015-01-25 14:18:09 +0000
3+++ camera-app.qml 2015-04-24 12:13:46 +0000
4@@ -153,6 +153,7 @@
5 height: viewSwitcher.height
6 overlayVisible: !viewSwitcher.moving && !viewSwitcher.flicking
7 inView: !viewSwitcher.atXEnd
8+ opacity: inView ? 1.0 : 0.0
9 onPhotoTaken: {
10 galleryView.prependMediaToModel(filePath);
11 galleryView.showLastPhotoTaken();
12@@ -169,6 +170,7 @@
13 height: viewSwitcher.height
14 inView: !viewSwitcher.atXBeginning
15 onExit: viewSwitcher.switchToViewFinder()
16+ opacity: inView ? 1.0 : 0.0
17 }
18 }
19 }

Subscribers

People subscribed via source and target branches