Prevent flicking from viewfinder to post capture or settings while preview animation...

diff --git a/qml/CameraView.qml b/qml/CameraView.qml
index 316af5e..694ee19 100644 (file)
--- a/qml/CameraView.qml
+++ b/qml/CameraView.qml
@@ -28,7 +28,8 @@ import CameraPlus 1.0
 
 Viewfinder {
     id: viewfinder
-    property bool pressed: focusReticle.locked || (loader.item ? loader.item.pressed : false)
+    property bool pressed: focusReticle.locked || preview.animationRunning
+        || (loader.item ? loader.item.pressed : false)
     property int policyMode: loader.item ? loader.item.policyMode : CameraResources.None
 
     camera: cam

diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml
index 884d61d..a90b30c 100644 (file)
--- a/qml/PostCaptureView.qml
+++ b/qml/PostCaptureView.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 
 // TODO: qrc:/qml/PostCaptureView.qml:104:5: QML CameraToolBar: Binding loop detected for property "height"
 // TODO: try to reload the preview thumbnail when the picture becomes available
-// TODO: prevent flicking to this view while preview animation is running
+
 Item {
     id: postCaptureView