equal
deleted
inserted
replaced
556 |
556 |
557 TBool showVideoModeToolbar = ( ECamCameraPreparedVideo == iController.CameraState() && |
557 TBool showVideoModeToolbar = ( ECamCameraPreparedVideo == iController.CameraState() && |
558 ( iController.CurrentOperation() != ECamCapturing && iController.CurrentOperation() != ECamPaused ) ); |
558 ( iController.CurrentOperation() != ECamCapturing && iController.CurrentOperation() != ECamPaused ) ); |
559 |
559 |
560 TBool precaptureToolbarState = !appUi->IsBurstEnabled() |
560 TBool precaptureToolbarState = !appUi->IsBurstEnabled() |
561 && !iStandbyModeActive && !appUi->IsInPretendExit() && !iController.IsKeyLockOn(); |
561 && !iStandbyModeActive && !appUi->IsInPretendExit(); |
562 |
562 |
563 if ( ( ECamCameraPreparedImage == iController.CameraState() || |
563 if ( ( ECamCameraPreparedImage == iController.CameraState() || |
564 showVideoModeToolbar ) && |
564 showVideoModeToolbar ) && |
565 !noToolbar && precaptureToolbarState ) |
565 !noToolbar && precaptureToolbarState ) |
566 { |
566 { |
1875 } |
1875 } |
1876 } |
1876 } |
1877 } |
1877 } |
1878 else if ( EAknTouchGestureFwDoubleTap == aEvent.Type() |
1878 else if ( EAknTouchGestureFwDoubleTap == aEvent.Type() |
1879 && ( ECamNoOperation == iController.CurrentOperation() |
1879 && ( ECamNoOperation == iController.CurrentOperation() |
1880 || ( ( ECamCapturing == iController.CurrentOperation() |
1880 || ( ECamCapturing == iController.CurrentOperation() |
1881 || ECamPaused == iController.CurrentOperation() ) |
|
1882 && iController.CurrentMode() == ECamControllerVideo ) ) ) |
1881 && iController.CurrentMode() == ECamControllerVideo ) ) ) |
1883 { |
1882 { |
1884 PRINT( _L("Camera <> double tap event") ); |
1883 PRINT( _L("Camera <> double tap event") ); |
1885 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1884 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1886 CCamZoomPane *zoomPane = appUi->ZoomPane(); |
1885 CCamZoomPane *zoomPane = appUi->ZoomPane(); |