diff -r 8c55c525d5d7 -r d486e5e3cc9a camerauis/cameraapp/generic/src/CamPostCaptureContainer.cpp --- a/camerauis/cameraapp/generic/src/CamPostCaptureContainer.cpp Mon Mar 15 12:39:00 2010 +0200 +++ b/camerauis/cameraapp/generic/src/CamPostCaptureContainer.cpp Wed Mar 31 21:06:44 2010 +0300 @@ -294,14 +294,21 @@ } // Draw the current image - snapshot or thumbnail CWindowGc& gc = SystemGc(); - gc.SetFaded( EFalse ); - - gc.SetBrushColor( KRgbBlack ); - gc.Clear(); - const CFbsBitmap* snapshot = iController.SnapshotImage(); TRect containerRect = Rect(); + TBool lateOperation = ( ECamCapturing == iController.CurrentOperation() + || ECamCompleting == iController.CurrentOperation() ); + + if ( iView.Id().iUid != ECamViewIdVideoPostCapture && + ( iController.ActiveCamera() != ECamActiveCameraSecondary || + lateOperation ) ) + { + gc.SetFaded( EFalse ); + gc.SetBrushColor( KRgbBlack ); + gc.Clear( iProcessingTextLayout.TextRect() ); + } + // If snapshot contains a bitmap if ( snapshot ) { @@ -341,30 +348,26 @@ OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPOSTCAPTURECONTAINER_DRAW, "e_CAM_APP_SNAPSHOT_DRAW 0" ); //CCORAPP_SNAPSHOT_DRAW_END } - TBool lateOperation = ( ECamCapturing == iController.CurrentOperation() - || ECamCompleting == iController.CurrentOperation() ); - - if( iProcessingText && //iProcessingBg && - iController.ActiveCamera() != ECamActiveCameraSecondary && - lateOperation - ) - { - PRINT( _L("Camera <> CCamPostCaptureContainer: draw processing text..") ); - // When iProcessingText exists (and we are in correct state), the processing - // image text needs to be drawn. - //iProcessingBg->Draw( gc, Rect() ); + if( iProcessingText && //iProcessingBg && + iController.ActiveCamera() != ECamActiveCameraSecondary && + lateOperation ) + { + PRINT( _L("Camera <> CCamPostCaptureContainer: draw processing text..") ); + // When iProcessingText exists (and we are in correct state), the processing + // image text needs to be drawn. + //iProcessingBg->Draw( gc, Rect() ); - gc.SetBrushColor( KRgbWhite ); - gc.SetBrushStyle( CGraphicsContext::ENullBrush ); - iProcessingTextLayout.DrawText( gc, *iProcessingText, ETrue, KRgbBlack ); - } + gc.SetBrushColor( KRgbWhite ); + gc.SetBrushStyle( CGraphicsContext::ENullBrush ); + iProcessingTextLayout.DrawText( gc, *iProcessingText, ETrue, KRgbBlack ); + } if( iBatteryPaneController ) { if( iPaneInUse == ECamPaneCounter ) - { - iNaviCounterControl->DrawNaviCtr( gc ); - } + { + iNaviCounterControl->DrawNaviCtr( gc ); + } // Draw the battery pane iBatteryPaneController->Draw( gc ); }