camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp
branchRCL_3
changeset 16 d486e5e3cc9a
parent 12 8c55c525d5d7
child 18 51dda465e618
--- a/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp	Mon Mar 15 12:39:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp	Wed Mar 31 21:06:44 2010 +0300
@@ -1779,7 +1779,8 @@
     PRINT( _L("Camera => CCamPreCaptureViewBase::HandleTouchGestureL") );
     
     // Skipped modes here
-    if ( iController.ActiveCamera() == ECamActiveCameraSecondary )
+    if ( ( iController.ActiveCamera() == ECamActiveCameraSecondary ) || 
+         ( ECamNoOperation != iController.CurrentOperation() )  )
         {
         PRINT( _L("Camera <= CCamPreCaptureViewBase::HandleTouchGestureL") );
         return;
@@ -1800,6 +1801,11 @@
             // level between top widescreen and vga levels
             CCamPreCaptureContainerBase* container = static_cast<CCamPreCaptureContainerBase*>( iContainer );
             container->BlinkResolutionIndicatorOnChange( ETrue );
+
+            // Hide the zoom pane in case of pinch
+            CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
+            appUi->ZoomPane()->MakeVisible( EFalse, ETrue );
+
             if ( iController.ToggleWideScreenQuality( wide ) )
                 {
                 iLastMovement = currMove;