diff -r ff572dfe6d86 -r 9674c1a575e9 idlehomescreen/xmluirendering/uiengine/inc/xnbackgroundmanager.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xnbackgroundmanager.h Fri Mar 12 15:41:49 2010 +0200 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xnbackgroundmanager.h Mon Mar 15 12:39:47 2010 +0200 @@ -46,6 +46,13 @@ { public: + enum WppType + { + ENone, + ECommon, + EPageSpecific + }; + /** * Two-phased constructor. * @param aWrapper HSPS wrapper @@ -74,7 +81,7 @@ * @since S60 5.0 * @param aFileName WallpaperImage image path and filename * @return Error code. - */ + */ TInt AddWallpaperL( const TDesC& aFileName ); /** @@ -86,11 +93,11 @@ void DeleteWallpaper( CXnViewData& aViewData ); /** - * Checks whether page specific wallpaper feature is activated or not. + * Returns wallpaper type. * * @since S60 5.0 */ - TBool ActivatedL(); + CXnBackgroundManager::WppType WallpaperType(); /** * Shows wallpaper change dialog @@ -106,7 +113,15 @@ * @param aOldView Old view * @param aNewView New view */ - void WallpaperChanged( CXnViewData& aOldView, CXnViewData& aNewView ); + void WallpaperChanged( const CXnViewData& aOldView, + const CXnViewData& aNewView ); + + /** + * Draws wallpaper immediately, or once the window comes visible. + * + * @since S60 5.0 + */ + void UpdateScreen(); public: // Functions from base classes @@ -172,8 +187,7 @@ void CheckFeatureTypeL(); TInt AddPageSpecificWallpaperL( const TDesC& aFileName ); TInt AddCommonWallpaperL( const TDesC& aFileName, TBool aSave = ETrue ); - void ReadWallpaperFromCenrepL(); - void UpdateScreen(); + void ReadWallpaperFromCenrepL(); void DrawEditModeBackgroundSkin() const; /** @@ -223,10 +237,9 @@ TRect iRect; /** - * States whether page specific wallpaper is supported or - * same wallpaper is shown in all pages. + * Stores wallpaper type. */ - TBool iFeatureSuppoted; + CXnBackgroundManager::WppType iType; /** * Internal wallpaper update in progress