MCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp

equal deleted inserted replaced

-:ff572dfe6d86
+:9674c1a575e9
 #include "hspssapi.h"
 #include "xnappuiadapter.h"
 #include "xnwallpaperview.h"
 #include "xnrootdata.h"
 #include "xnuiengine.h"
+#include "xneffectmanager.h"
 // SYSTEM INCLUDE FILES
+#include <gfxtranseffect/gfxtranseffect.h>
+#include <akntransitionutils.h>
 #include <aknlistquerydialog.h>
 #include <xnuiengine.rsg>
 #include <AknSkinsInternalCRKeys.h>
 #include <activeidle2domaincrkeys.h>
 #include <AknsWallpaperUtils.h>
 #include <AknsLayeredBackgroundControlContext.h>
 #include <driveinfo.h>
 using namespace hspswrapper;
+// Constants
 _LIT8( KSingle, "single" );
 const TUid KDummyUid = { 0x0000000 };
-const TInt KSkinGfxInnerRectShrink = 5;
+const TInt KSkinGfxInnerRectShrink( 5 );
+const TInt KCallbackDelay( 500000 ); // 500ms
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // C++ default constructor.
 // Reads from cenrep wheteher page specific wallpaper is enabled or not
 CheckFeatureTypeL();
 iTimer = CPeriodic::NewL( CActive::EPriorityIdle );
+GfxTransEffect::Register( this, KGfxContextBgAppear );
 }
 // -----------------------------------------------------------------------------
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 // Destructor.
 // -----------------------------------------------------------------------------
 //
 CXnBackgroundManager::~CXnBackgroundManager()
 {
+GfxTransEffect::Deregister( this );
 delete iTimer;
 CleanCache();
 iSkinSrv.Close();
 delete iDiskNotifier;
 iFsSession.Close();
 // CXnBackgroundManager::Draw
 // -----------------------------------------------------------------------------
 //
 void CXnBackgroundManager::Draw(const TRect& aRect) const
 {
-if( iFeatureSuppoted )
+CFbsBitmap* wallpaper( NULL );
+if( iType == EPageSpecific )
 {
 CXnViewData& viewData( iViewManager.ActiveViewData() );
-CFbsBitmap* wallpaper = viewData.WallpaperImage();
+wallpaper = viewData.WallpaperImage();
-if( wallpaper )
+}
-{
+else if( iType == ECommon )
-TSize bitmapSize = wallpaper->SizeInPixels();
+{
+wallpaper = iBgImage;
-if( iRect.Height() > bitmapSize.iHeight && iRect.Width() > bitmapSize.iWidth )
+}
-{
-TInt width = bitmapSize.iWidth / 2;
+// Draw bg image
-TInt height = bitmapSize.iHeight / 2;
+if( wallpaper )
+{
-TPoint point = iRect.Center();
+TSize bitmapSize = wallpaper->SizeInPixels();
-point.SetXY( point.iX - width, point.iY - height );
-SystemGc().SetBrushColor( KRgbBlack );
-SystemGc().Clear( aRect );
-SystemGc().DrawBitmap( TRect( point, bitmapSize), wallpaper );
-}
-else
-{
-SystemGc().DrawBitmap( iRect, wallpaper );
-}
-if( iViewManager.UiEngine().IsEditMode() )
-{
-DrawEditModeBackgroundSkin();
-}
-return;
-}
-}
-else if( iBgImage )
-{
-TSize bitmapSize = iBgImage->SizeInPixels();
+// If image is smaller that screen size it needs to be centralized
 if( iRect.Height() > bitmapSize.iHeight && iRect.Width() > bitmapSize.iWidth )
 {
 TInt width = bitmapSize.iWidth / 2;
 TInt height = bitmapSize.iHeight / 2;
 TPoint point = iRect.Center();
 point.SetXY( point.iX - width, point.iY - height );
 SystemGc().SetBrushColor( KRgbBlack );
 SystemGc().Clear( aRect );
-SystemGc().DrawBitmap( TRect( point, bitmapSize ), iBgImage );
+SystemGc().DrawBitmap( TRect( point, bitmapSize), wallpaper );
 }
 else
 {
-SystemGc().DrawBitmap( iRect, iBgImage );
+SystemGc().DrawBitmap( iRect, wallpaper );
 }
-if( iViewManager.UiEngine().IsEditMode() )
+}
-{
-DrawEditModeBackgroundSkin();
+// Skin bg is used by default
-}
+else
-return;
+{
-}
+MAknsSkinInstance* skin( AknsUtils::SkinInstance() );
-MAknsSkinInstance* skin( AknsUtils::SkinInstance() );
+AknsDrawUtils::Background( skin, iBgContext, this, SystemGc(), aRect );
-AknsDrawUtils::Background( skin, iBgContext, this, SystemGc(), aRect );
+}
+// Draw edit mode background highlight
 if( iViewManager.UiEngine().IsEditMode() )
 {
 DrawEditModeBackgroundSkin();
 }
 }
 // -----------------------------------------------------------------------------
 // CXnBackgroundManager::SizeChanged
 // -----------------------------------------------------------------------------
 //
 void CXnBackgroundManager::SizeChanged()
 {
 iRect = Rect();
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 TRAP_IGNORE( UpdateWallpapersL() );
 }
-else
+else if( iType == ECommon )
 {
 if( iBgImagePath )
 {
 delete iBgImage;
 iBgImage = NULL;
 // CXnBackgroundManager::AddWallpaperL
 // ---------------------------------------------------------------------------
 //
 TInt CXnBackgroundManager::AddWallpaperL( const TDesC& aFileName )
 {
-TInt retVal = KErrNone;
+TInt retVal( KErrNone );
-if( iFeatureSuppoted )
+GfxTransEffect::Begin( this, KGfxControlActionAppear );
+if ( iType == EPageSpecific )
 {
 retVal = AddPageSpecificWallpaperL( aFileName );
 }
-else
+else if ( iType == ECommon )
 {
 retVal = AddCommonWallpaperL( aFileName );
 }
+GfxTransEffect::SetDemarcation( this, Position() );
+GfxTransEffect::End( this );
 return retVal;
 }
 // ---------------------------------------------------------------------------
 // CXnBackgroundManager::DeleteWallpaper
 // ---------------------------------------------------------------------------
 //
 void CXnBackgroundManager::DeleteWallpaper( CXnViewData& aViewData )
 {
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 const TDesC& path = aViewData.WallpaperImagePath();
 if( path != KNullDesC )
 {
 RemoveWallpaperFromCache( path, &aViewData );
 TRAP_IGNORE( aViewData.SetWallpaperImagePathL( KNullDesC ) );
 aViewData.SetWallpaperImage( NULL );
 }
 }
-else
+else if( iType == ECommon )
 {
 if( iBgImagePath )
 {
 iSkinSrv.RemoveWallpaper( *iBgImagePath );
 delete iBgImagePath;
 iBgImage = NULL;
 }
 }
 // ---------------------------------------------------------------------------
-// CXnBackgroundManager::ActivatedL
+// CXnBackgroundManager::WallpaperType
 // ---------------------------------------------------------------------------
 //
-TBool CXnBackgroundManager::ActivatedL()
+CXnBackgroundManager::WppType CXnBackgroundManager::WallpaperType()
 {
-return iFeatureSuppoted;
+return iType;
 }
 // -----------------------------------------------------------------------------
 // CXnBackgroundManager::WallpaperChanged
 // -----------------------------------------------------------------------------
 //
-void CXnBackgroundManager::WallpaperChanged( CXnViewData& aOldView, CXnViewData& aNewView )
+void CXnBackgroundManager::WallpaperChanged( const CXnViewData& aOldView,
-{
+const CXnViewData& aNewView )
-if( iFeatureSuppoted &&
+{
+if( iType == EPageSpecific &&
 aOldView.WallpaperImagePath().Compare( aNewView.WallpaperImagePath() ) )
 {
 UpdateScreen();
 // Since AknsWallpaperUtils::SetIdleWallpaper() call is slow, it is called
 // asynchronously. In that way we can avoid it slowing down page switching.
 if ( iTimer->IsActive() )
 {
 iTimer->Cancel();
 }
-iTimer->Start( 0, 1000, TCallBack( TimerCallback, this ) );
+iTimer->Start(KCallbackDelay, KCallbackDelay, TCallBack( TimerCallback, this ) );
 }
 }
 // ---------------------------------------------------------------------------
 // CXnBackgroundManager::SaveWallpaperL
 // ---------------------------------------------------------------------------
 //
 void CXnBackgroundManager::SaveWallpaperL()
 {
 // Save wallpaper to HSPS
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 TBuf8<KMaxFileName> wallpaper8;
 CXnViewData& viewData( iViewManager.ActiveViewData() );
 wallpaper8.Copy( viewData.WallpaperImagePath() );
 SetSettingPropertyL( viewData.PluginId(), KWallpaper,
 {
 AddWallpaperL( KNullDesC );
 }
 else if ( selectedIndex == 1 )
 {
-iViewManager.AppUiAdapter().ActivateLocalViewL( KWallpaperViewUid,
+CXnAppUiAdapter& appui( iViewManager.AppUiAdapter() );
-KDummyUid, KSingle );
+appui.EffectManager()->BeginFullscreenEffectL(
+KGfxContextOpenWallpaperView, iViewManager.ActiveViewData() );
+appui.ActivateLocalViewL( KWallpaperViewUid, KDummyUid, KSingle );
 }
 }
 CleanupStack::Pop( query );
 }
 // CXnBackgroundManager::RemovableDiskInsertedL
 // -----------------------------------------------------------------------------
 //
 void CXnBackgroundManager::RemovableDiskInsertedL()
 {
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 CXnRootData& rootData = iViewManager.ActiveAppData();
 if( !&rootData )
 {
 return;
 // CXnBackgroundManager::CheckFeatureTypeL
 // ---------------------------------------------------------------------------
 //
 void CXnBackgroundManager::CheckFeatureTypeL()
 {
-iFeatureSuppoted = EFalse;
+iType = ECommon;
 CRepository* repository = CRepository::NewL( TUid::Uid( KCRUidActiveIdleLV ) );
 CleanupStack::PushL( repository );
 if ( repository )
 {
 // Get wallpaper handling type from cenrep
 TInt type;
 TInt err = repository->Get( KAIWallpaperChangeType, type );
 if ( err == KErrNone && type == 1)
 {
-iFeatureSuppoted = ETrue;
+iType = EPageSpecific;
 }
 else
 {
 TFileName path;
 err = repository->Get( KAIWallpaperPath, path );
 TInt err = repository->Get( KPslnWallpaperType, wallpaperType );
 if ( err == KErrNone )
 {
 if ( wallpaperType == 0 )
 {
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 CXnViewData& viewData( iViewManager.ActiveViewData() );
 RemoveWallpaperFromCache( viewData.WallpaperImagePath() );
 RemoveWallpaperL( viewData );
 }
-else
+else if( iType == ECommon )
 {
 if( iBgImagePath )
 {
 iSkinSrv.RemoveWallpaper( *iBgImagePath );
 delete iBgImagePath;
 // Get wallpaper image path from cenrep and save it
 TFileName wallpaper;
 err = repository->Get( KPslnIdleBackgroundImagePath, wallpaper );
 if ( err == KErrNone )
 {
-if( iFeatureSuppoted )
+if( iType == EPageSpecific )
 {
 AddPageSpecificWallpaperL( wallpaper );
 }
-else
+else if( iType == ECommon )
 {
 AddCommonWallpaperL( wallpaper, EFalse );
 }
 }
 }

branch	RCL_3
changeset 12	9674c1a575e9
parent 11	ff572dfe6d86
child 17	b8fae6b8a148