Mercurial Mercurial > oss > FCL > sf > app > camera / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp
branchRCL_3
changeset 62 f0c0788c4de2
parent 54 bac7acad7cb3
child 67 756ad29ed18e
equal deleted inserted replaced
57:2c87b2808fd7 62:f0c0788c4de2 
   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();
 
   561                 && !iStandbyModeActive && !appUi->IsInPretendExit() && !iController.IsKeyLockOn();
 
   562         
   562         
   563         if ( ( ECamCameraPreparedImage == iController.CameraState() || 
   563         if ( ( ECamCameraPreparedImage == iController.CameraState() || 
   564                 showVideoModeToolbar ) &&     
   564                 showVideoModeToolbar ) &&     
   565                !noToolbar && precaptureToolbarState )
 
   565                !noToolbar && precaptureToolbarState )
 
   566             {
 
   566             {
FCL/sf/app/camera