camera-app

Merge lp:~schwann/camera-app/camera-vf-centered into lp:camera-app

  1. camera-vf-centered
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Merged at revision: 215
Proposed branch: lp:~schwann/camera-app/camera-vf-centered
Merge into: lp:camera-app
Diff against target: 13 lines (+3/-1)
1 file modified
camera-app.qml (+3/-1)
To merge this branch: bzr merge lp:~schwann/camera-app/camera-vf-centered
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Bill Filler (community) Approve
Review via email: mp+190143@code.launchpad.net

Commit message

Center the viewfinder in more cases fixes LP: #1179503

Description of the change

Center the viewfinder in more cases fixes LP: #1179503

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/camera-app-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4826
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1004
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2686
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2686/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2236

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/128/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/camera-app-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4834
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/709
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/709/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2695/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2244

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/129/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/camera-app-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4899
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2777/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/774
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/774/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2779/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2313/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2328

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/132/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/camera-app-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4916
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/791
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2799
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2799/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2331
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2367

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/136/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/camera-app-autolanding/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-amd64-autolanding/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-autolanding/66
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-armhf-autolanding/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-saucy-i386-autolanding/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4923
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/798
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/798/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2812/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2341
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2381

review: Needs Fixing (continuous-integration)

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 2013-10-02 09:33:11 +0000
3+++ camera-app.qml 2013-10-09 14:19:27 +0000
4@@ -117,7 +117,9 @@
5 VideoOutput {
6 id: viewFinder
7
8- property bool shouldBeCentered: device.isLandscape
9+ property bool shouldBeCentered: device.isLandscape ||
10+ ((viewFinder.width > viewFinderGeometry.width) &&
11+ device.naturalOrientation === "portrait")
12 property real anchoredY: viewFinderGeometry.y * (device.isInverted ? +1 : -1)
13 property real anchoredX: viewFinderGeometry.x * (device.isInverted ? +1 : -1)
14

Subscribers

People subscribed via source and target branches