diff -r c8fb4cf7b3ae -r 5e18d8c489d6 textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayoutvkb.h --- a/textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayoutvkb.h Tue May 11 16:31:42 2010 +0300 +++ b/textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayoutvkb.h Tue May 25 13:03:44 2010 +0300 @@ -136,6 +136,42 @@ }; }; +class CFepUiKeyboardExt : public CBase + { +public: + ~CFepUiKeyboardExt() + { + delete iBitmap; + delete iHighlightDev; + delete iHighlightGc; + + delete iHighlightKeyBmp; + delete iNormalKeyBmp; + delete iDimmedKeyBmp; + delete iNormalKeyDev; + delete iHighlightKeyDev; + delete iDimmedKeyDev; + delete iKeyGc; + } +private: + void CreateBmpDevL(const TDisplayMode &aMode); +private: + CFbsBitmap* iBitmap; + CFbsBitmapDevice* iHighlightDev; + CFbsBitGc* iHighlightGc; + + CFbsBitmap* iHighlightKeyBmp; + CFbsBitmap* iNormalKeyBmp; + CFbsBitmap* iDimmedKeyBmp; + + CFbsBitmapDevice* iNormalKeyDev; + CFbsBitmapDevice* iHighlightKeyDev; + CFbsBitmapDevice* iDimmedKeyDev; + CFbsBitGc* iKeyGc; + +friend class CVirtualKeyboard; + }; + //class CVirtualKeyboard /** * CVirtualKeyboard @@ -814,12 +850,7 @@ * Item text display color. */ TRgb iFontColor; - - /** - * Reserve item - */ - TInt iReserver1; - + TAknsItemID iKeyNormalSkinId; TAknsItemID iKeyHighlightSkinId; TAknsItemID iKeyDimSkinId; @@ -866,13 +897,45 @@ * The shift icon showing on the key */ CPenInputColorIcon* iShiftIcon; - + /** * The star icon showing on the key */ CPenInputColorIcon* iStarIcon; + + MPeninputVkbPreviewBubbleRenderer* iPreviewBubbleRenderer; + + /** + * Reserve item + */ + CFepUiKeyboardExt* iExt; + + +protected: + //void HandleResourceChange(TInt aType); + virtual IMPORT_C void HandleResourceChange(TInt aType); +private: + void CreateBmpDevL(); + CFbsBitmap* Bitmap() { return iExt->iBitmap;} + CFbsBitmapDevice* HighlightDev() { return iExt->iHighlightDev;} + CFbsBitGc* HighlightGc() { return iExt->iHighlightGc;} + CFbsBitmap* NormalKeyBmp() { return iExt->iNormalKeyBmp;} + CFbsBitmap* HighightKeyBmp() { return iExt->iHighlightKeyBmp;} + CFbsBitmap* DimmedKeyBmp() { return iExt->iDimmedKeyBmp;} - MPeninputVkbPreviewBubbleRenderer* iPreviewBubbleRenderer; + CFbsBitmapDevice* HighlightKeyDev() { return iExt->iHighlightKeyDev;} + CFbsBitmapDevice* NormalKeyDev() { return iExt->iNormalKeyDev;} + CFbsBitmapDevice* DimmedKeyDev() { return iExt->iDimmedKeyDev;} + CFbsBitGc* KeyGc() { return iExt->iKeyGc;} + + + CFbsBitmap* PrepareMaskBmpL(CFbsBitGc* aGc, const TDisplayMode& aMode, const TRect& aRect); + CFbsBitmap* PrepareKeyBmpL(CFbsBitGc* aGc, const TDisplayMode& aMode, const TRect& aRect, + const TRect& aInnerRect,const TAknsItemID& aFrameID, const TAknsItemID& aCenterID, const TRect& aKeyRect); + + TBool PrepareKeyBmp(CFbsBitmap* aBmp,CFbsBitmapDevice* aDev,const TRect& aRect, + const TRect& aInnerRect,const TAknsItemID& aFrameID, const TAknsItemID& aCenterID,const TRect& aKeyRect); + friend class CVirtualKeyCtrl; friend class CVirtualRawKeyCtrl; //friend class CVirtualKey;