diff -r c8fb4cf7b3ae -r 5e18d8c489d6 textinput/peninputfingerhwrar/src/peninputfingerhwrarsymboltable.cpp --- a/textinput/peninputfingerhwrar/src/peninputfingerhwrarsymboltable.cpp Tue May 11 16:31:42 2010 +0300 +++ b/textinput/peninputfingerhwrar/src/peninputfingerhwrarsymboltable.cpp Tue May 25 13:03:44 2010 +0300 @@ -25,12 +25,12 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include @@ -221,29 +221,8 @@ { iIsLandscape = aIsLandscape; - // relayout the button group - TRect spaceBtnRect(aBtnRects[0]); - - TInt pdx = (spaceBtnRect.Size().iWidth/3)/2; - MoveIconButton(iSpaceBtn,spaceBtnRect,pdx,KSymbolButtonInnerPadding); - - TRect pieceInnerRect = spaceBtnRect; - pieceInnerRect.Shrink(pdx*2,KSymbolButtonInnerPadding); - - // that's a not good algrithm in funciton AknPenInputDrawUtils::Draw3PiecesColorIcon for drawing 3Pieces icons - // as when the outter rect's height was not equal to the inter rect's height, the target rects the left icons and right icons - // would be bitblited onto are set to be Rect(0.0.0.0.0) [[which should not be that behavior]]. - // Please theck the codes: AknPenInputDrawUtils::Draw3PiecesColorIcon: this function should be Updated. - iSpaceBtn->SetDraw3PieceFrameInfo( - TDraw3PiecesFrame(KAknsIIDQgnIndiInputSpaceL, - KAknsIIDQgnIndiInputSpaceMiddle, - KAknsIIDQgnIndiInputSpaceR, - pieceInnerRect)); - TRect enterBtnRect(aBtnRects[1]); - - MoveIconButton(iEnterBtn,enterBtnRect,pdx,KSymbolButtonInnerPadding); - - TRect pageBtnRect(aBtnRects[2]); + // relayout the button + TRect pageBtnRect(aBtnRects[0]); if(aIsLandscape) { @@ -303,15 +282,6 @@ void CPeninputArabicFingerHwrSymbolTable::CreateButtonGroupL() { - iEnterBtn = CreateEventBtnL(EHwrCtrlIdBtnEnter,R_AKN_FEP_HWR_ENTER); - iSpaceBtn = CreateEventBtnL(EHwrCtrlIdBtnSpace,R_AKN_FEP_HWR_SPACE); - // Create 3-pieces color icon for space button - CPenInput3PiecesColorIcons* colorIcons = - CPenInput3PiecesColorIcons::NewL( R_AKN_FEP_VKB_SPACE_ICON1, - R_AKN_FEP_VKB_SPACE_ICON2, - R_AKN_FEP_VKB_SPACE_ICON3 ); - iSpaceBtn->Set3PiecesColorIcons( colorIcons ); - // create the page button for portrait i3Page1Btn = CreateEventBtnL(EHwrCtrlId3Page1Btn, R_AKN_FEP_ARABIC_3PAGE_HWR_SCT_PAGE_1); i3Page2Btn = CreateEventBtnL(EHwrCtrlId3Page2Btn, R_AKN_FEP_ARABIC_3PAGE_HWR_SCT_PAGE_2); @@ -574,7 +544,7 @@ TRect innerrect = aKeyRect; - innerrect.Shrink( TSize(10, 10) ); + innerrect.Shrink( TSize(2, 2) ); vk->SetInnerRect( innerrect ); return vk; @@ -614,7 +584,7 @@ aVirtualKey->SetRect(aKeyRect); TRect innerrect = aKeyRect; - innerrect.Shrink( TSize(10,10) ); + innerrect.Shrink( TSize(2,2) ); aVirtualKey->SetInnerRect( innerrect ); } @@ -721,15 +691,17 @@ { if(AbleToDraw()) { - DrawOpaqueMaskBackground( Rect() ); - + //Draw button area background. +// DrawOpaqueMaskBackground( Rect() ); +// DrawOpaqueMaskBackground(); + DrawOpaqueMaskBackground(iMutiPageKeypad->Rect()); if( BackgroundBmp() && BackgroundBmp()->SizeInPixels() != Rect().Size() ) { AknIconUtils::SetSize(BackgroundBmp(), Rect().Size(), EAspectRatioNotPreserved); } // draw background - DrawBackground(); - +// DrawBackground(); + DrawBackground(iMutiPageKeypad->Rect()); // draw group CControlGroup::Draw(); @@ -737,5 +709,4 @@ UpdateArea(iRect); } } - // End Of File