Merge lp:~fboucault/camera-app/do_not_focus_outside_viewfinder into lp:camera-app/staging

[Florian Boucault]

Only accept manual focus on points inside the viewfinder.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/47/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/424
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1023
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27978

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Works and looks as expected. Did you add a manual test for this to the test plan ?

review: Approve

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderView.qml	2016-03-04 15:19:38 +0000
@@ -60,11 +60,15 @@
         property bool failedToConnect: false
 
         function manualFocus(x, y) {
-            viewFinderOverlay.showFocusRing(x, y);
-            autoFocusTimer.restart();
-            focus.focusMode = Camera.FocusAuto;
-            focus.customFocusPoint = viewFinder.mapPointToSourceNormalized(Qt.point(x, y));
-            focus.focusPointMode = Camera.FocusPointCustom;
+            var normalizedPoint = viewFinder.mapPointToSourceNormalized(Qt.point(x, y - viewFinder.y));
+            if (normalizedPoint.x >= 0.0 && normalizedPoint.x <= 1.0 &&
+                normalizedPoint.y >= 0.0 && normalizedPoint.y <= 1.0) {
+                viewFinderOverlay.showFocusRing(x, y);
+                autoFocusTimer.restart();
+                focus.focusMode = Camera.FocusAuto;
+                focus.customFocusPoint = normalizedPoint;
+                focus.focusPointMode = Camera.FocusPointCustom;
+            }
         }
 
         function autoFocus() {