diff -r 35baca0e7a2e -r 023eef975703 javamanager/javainstaller/installer/src.s60/iconconverter/iconconverter.h --- a/javamanager/javainstaller/installer/src.s60/iconconverter/iconconverter.h Tue Jul 06 20:36:19 2010 +0300 +++ b/javamanager/javainstaller/installer/src.s60/iconconverter/iconconverter.h Fri Jul 09 16:35:45 2010 +0300 @@ -26,6 +26,10 @@ #include +class CBitmapScaler; +class TIconSizes; + + namespace java { @@ -161,6 +165,15 @@ HBufC8* apIconBuf, const TDesC &aOutputFile); + /** + * Scale the original icon into the current temporary icon. + */ + void ScaleL(CBitmapScaler& aScaler, const TSize aSize); + + /** + * Get the ideal icon sizes from UI, trough the ecom plugin notifier. + */ + TIconSizes GetIdealIconSizes(); private: /** @@ -176,16 +189,25 @@ CBufferedImageDecoder* iImageDecoder; /** - * Pointer to bitmap generated from the icon + * Pointer to bitmap generated from the icon. */ CFbsBitmap* iBitmap; /** * Pointer to the bitmap mask generated from the icon. - * May be NULL if the original icon not not have mask. */ CFbsBitmap* iBitmapMask; + /** + * Scaled copy of the original icon bitmap. + */ + CFbsBitmap* iBitmapScaledCopy; + + /** + * Scaled copy of the original icon mask. + */ + CFbsBitmap* iBitmapMaskScaledCopy; + CActiveListener *iActiveListener; };