FCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewcontainer.cpp

equal deleted inserted replaced

-:943ff5625028
+:171e07ac910f
 #include <mpxfmtx.rsg> // For FF_FMTX
 #include <mpxappui.hrh>
 #include <mpxinternalcrkeys.h>
 #include <touchfeedback.h>
 #include <akntranseffect.h>                 // For transition effects
-#include <gfxtranseffect\gfxtranseffect.h>  // For transition effects
+#include <gfxtranseffect/gfxtranseffect.h>  // For transition effects
 #include "mpxcommonplaybackviewcontainer.h"
 #include "mpxcommonplaybackviewlayout.h"
 #include "mpxcommonplaybackview.hrh"
 #include "mpxplaybackview.hlp.hrh"
 iActiveView = ETrue;
 iPrerollCompleted = EFalse;
 iLightStatus = CHWRMLight::ELightStatusUnknown;
 iIsForeground = EFalse ;
 iLight = CHWRMLight::NewL(this);
 	DrawableWindow()->SetPointerGrab( ETrue );
 EnableDragEvents();
 MPX_DEBUG1( "CMPXCommonPlaybackViewContainer::ConstructL() exiting" );
 delete iMinSecFormatString;
 delete iShortFormatString;
 delete iCommonUiHelper;
 if ( iLight )
 {
 delete iLight;
 iLight = NULL;
 }
 delete iButtonManager;
 if ( aBitmap && KErrNone == aErr )
 {
 iTrackAlbumArt = aBitmap;
 }
 DrawDeferred();
 //Window().Invalidate( iAlbumArtRect );
 //Window().Invalidate( iSliderPaneRect );
 }
 // ---------------------------------------------------------------------------
 if ( iDisplayAlbumArt && aRect.Intersects( iAlbumArtRect ) )
 {
 if ( iTrackAlbumArt )
 {
-// Calculating the CenterPoint for Drawing the albumart image
-TSize bmpSizeInPixels = iTrackAlbumArt->SizeInPixels();
-TInt xPos = ( iAlbumArtRect.Width() - bmpSizeInPixels.iWidth )
-/ 2;
-TInt yPos =
-( iAlbumArtRect.Height() - bmpSizeInPixels.iHeight )
-/ 2;
-TPoint Centerpos = TPoint(xPos, yPos );
-// bitmap top left corner position
-Centerpos += iAlbumArtRect.iTl;
 // Draw album art and frame
-gc.BitBlt( Centerpos, iTrackAlbumArt);
+gc.DrawBitmap( iAlbumArtRect, iTrackAlbumArt, iTrackAlbumArt->SizeInPixels() );
 TRgb color = KRgbBlack;
 AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
 EAknsCIQsnTextColorsCG50 );
-TRect imageRect( Centerpos, iTrackAlbumArt->SizeInPixels() );
 gc.SetPenStyle( CGraphicsContext::ESolidPen );
 gc.SetBrushStyle( CGraphicsContext::ENullBrush );
 gc.SetPenColor( color );
-gc.DrawRect( imageRect );
+gc.DrawRect( iAlbumArtRect );
 }
 else
 {
 DrawIndicator( gc, aRect, iAlbumArtRect, iDefaultAlbumArt );
 }
 }
 // ---------------------------------------------------------------------------
 // Update progress bar graphics and redraw.
 // Refresh happens only when backlight is ON and
 // the UI is in foreground.
 // Note: Some display types may not need backlight. In that case
 // code may need to be adjusted accordingly.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CMPXCommonPlaybackViewContainer::RefreshProgressBar()
 }
 else
 {
 background->SetBitmap( KAknsIIDQsnBgAreaMain );
 background->SetRect( aRect );
 }
 }
 // ---------------------------------------------------------------------------
 }
 else
 {
 return 0;
 }
 }
 // ---------------------------------------------------------------------------
 // From CCoeControl
 // Gets an indexed component of a compound control.
 // ---------------------------------------------------------------------------
 //
 TReal width;
 switch( aPointerEvent.iType )
 {
 case TPointerEvent::EButton1Down:
 {
 if ( iSliderPaneRect.Contains(aPointerEvent.iPosition) &&
 ( iMode == EPlayMode || iMode == EPauseMode ))
 {
 // Pointer events
 SetGloballyCapturing( ETrue );
 SetPointerCapture( ETrue );
 iPlaybackSlider->Bitmap(),
 playbackBarSize,
 EAspectRatioNotPreserved );
 }
 if ( iAlbumArtRect.Contains(aPointerEvent.iPosition ) )
 {
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if (feedback)
 {
 feedback->InstantFeedback(ETouchFeedbackBasic);
 }
 if ( iCommandObserver )
 								{
 iCommandObserver->ProcessCommandL( EMPXCmdVolumeChanged );
 }
 }
 MPX_FUNC( "CMPXCommonPlaybackViewContainer::LightStatusChanged" );
 if ( aTarget == CHWRMLight::EPrimaryDisplay )
 {
 		MPX_DEBUG2(" LightStatusChanged: (%d)", aStatus);
 		if ( ( aStatus == CHWRMLight::ELightOn || aStatus == CHWRMLight::ELightOff ) && aStatus != iLightStatus )
 	    	{
 			iLightStatus = aStatus;
 			}
 }
 }
 // -----------------------------------------------------------------------------
 // CMPXCommonPlaybackViewContainer::ReStoreButtons
 // -----------------------------------------------------------------------------
 //
 void CMPXCommonPlaybackViewContainer::RestoreButtons(
 TMPXPlaybackState aState )
 {
 if ( iEnableButtons )
 {
 iButtonManager->RestoreButtonStates( aState );

branch	RCL_3
changeset 15	171e07ac910f
parent 14	943ff5625028
child 17	c8156a91d13c