FCL/sf/mw/inputmethods: comparison textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutvkbkeyctrl.cpp

equal deleted inserted replaced

-:bd83ceabce89
+:5a1685599b76
 // CVirtualKeyCtrl::DrawKeyText
 // Draw key text
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
-void CVirtualKeyCtrl::DrawKeyText(CFbsBitGc* aGc)
+void CVirtualKeyCtrl::DrawKeyText(CFbsBitGc* aGc, const TRect& aRect)
 {
 TBool textlineset = EFalse;
 // if text line set
 for (TInt i = 0; i <= EPosLast; i++)
 textlineset = ETrue;
 if (iKeyInfo->KeyUnicodes(TVirtualKeyTextPos(i)) != KNullDesC)
 {
 TAknLayoutText textLayout;
-textLayout.LayoutText(GetRect(),
+textLayout.LayoutText(aRect,
 iKeyboard->TextLineLayout(TVirtualKeyTextPos(i)));
 				TRgb color( KRgbBlack );  // sane default for nonskinned case
 			    if ( AknsUtils::AvkonSkinEnabled() )
 			        {
 			        AknsUtils::GetCachedColor( UiLayout()->SkinInstance(),
 			    // replace the shift text to shift icon
 				if( iKeyboard->ShiftIcon() &&
 					iKeyInfo->KeyUnicodes(TVirtualKeyTextPos(i)) == KKeyShiftCharacter )
 					{
-					//CFbsBitGc* gc = GetGc();//static_cast<CFbsBitGc*>(BitGc());
+				    // Get the rect of the shift icon
+					TRect shiftIconDrawRect = iKeyboard->ShiftIconRect();
+					shiftIconDrawRect.Move( iKeyboard->Rect().iTl );
 					AknPenInputDrawUtils::DrawColorIcon( iKeyboard->ShiftIcon(),
 														 *aGc,
-														 textLayout.TextRect() );
+														 shiftIconDrawRect );
 					}
 				else if(iKeyboard->StarIcon() &&
 						iKeyInfo->KeyUnicodes(TVirtualKeyTextPos(i)) == KKeyStarCharacter )
 					{
 					// Get the size of the icon
 					TSize starIconSize = iKeyboard->StarIcon()->Bitmap()->SizeInPixels();
 					// Get the rect of draw icon area
-					TRect drawIconRect = textLayout.TextRect();
+					TRect drawIconRect = iKeyboard->StarIconRect();
+					drawIconRect.Move( iKeyboard->Rect().iTl );
 					// When the size of icon is different with the size of draw icon area,
 					// because the icon is drew from the left top coordinate of the draw
 					// icon area, so the icon will not be drew in the center. In this case,
 					// we need to adjust the top left coordinate of draw icon rect to
 					// make sure that the icon will be drew in the center of the key
 }
 if (!textlineset)
 {
 		TAknLayoutText textLayout;
-		textLayout.LayoutText(GetRect(), iKeyboard->iVKBTextLineLayout);
+		textLayout.LayoutText(aRect, iKeyboard->iVKBTextLineLayout);
 	    //CFbsBitGc* gc = static_cast<CFbsBitGc*>(BitGc());
 	    //charRect.Move(keyboardRect.iTl);
 	    //if(iKeyInfo->Dimmed())
 }
 gc->SetPenColor(KRgbBlack);
 gc->SetBrushStyle( CGraphicsContext::ENullBrush );
 //Draw text again.
-DrawKeyText(gc);
+DrawKeyText(gc,GetRect());
 }
 // ---------------------------------------------------------------------------
 // CVirtualKeyCtrl::DrawBmp
 // Draw bitmap
 }
 gc->SetPenColor( KRgbBlack );
 gc->SetBrushStyle( CGraphicsContext::ENullBrush );
 gc->SetFaded(EFalse);
-DrawKeyText(gc);
+DrawKeyText(gc,Rect());
 }
 CFbsBitGc* CVirtualKeyCtrl::GetGc()
 {
 if(UiLayout()->NotDrawToLayoutDevice())
 innerrect.Shrink( KDefaultKeyMargin, KDefaultKeyMargin );
 TBool bHasDrawn = EFalse;
 if(UiLayout()->NotDrawToLayoutDevice())
 {
-/*TBool ret = iKeyboard->PrepareKeyBmp(iKeyboard->HighightKeyBmp(),
-iKeyboard->HighlightKeyDev(),
-rect,innerrect,
-iKeyboard->KeySkinId(EKeyBmpHighlight),
-KAknsIIDDefault,Rect());*/
 TBool ret = iKeyboard->PrepareHighlightKeyBmp(rect,innerrect,Rect());
 if(ret)
 {
 gc->BitBlt(rect.iTl,iKeyboard->HighightKeyBmp());
 bHasDrawn = ETrue;
 gc->SetBrushStyle( CGraphicsContext::ENullBrush );
 gc->SetFaded(EFalse);
 if(UiLayout()->NotDrawToLayoutDevice())
 {
-		DrawKeyText(Keyboard()->HighlightGc());
+DrawKeyText(Keyboard()->HighlightGc(), GetRect());
 UpdateChangedArea(ETrue);
 		}
 else
 {
-		DrawKeyText(gc);
+DrawKeyText(gc, Rect());
 		}
 }
 // ---------------------------------------------------------------------------
 DrawDimKey();
 return;
 }
 if(iKeyInfo->Latched()||(PointerDown()&&!iKeyInfo->IsLatchKey()))
 {
+// If some layout initializes a RootCtrl redraw operation when the key was in a highlighted state, the normal key would not be seen
+// after key was returned to the normal state, that's because the layout device has been cleaned and redrawn again so when it comes to draw
+// this highlighted virtual key, it just draws the bitmap on its own device, so the area the highlighted key occupied on the layout device
+// is totally undrawn with the normal state key bitmap.
+// So we have to redraw the normal state key first to make sure the normal key was drawn on the layout bitmap.
+// [use case: Open the chinse VITUT, input some pinyin letter to bring the candidate list to the forground by clicking the virtual key ctrl
+//  ==> select some chinese words in the candidate list ==> then click and release the virtual key agian]
+if(UiLayout()->NotDrawToLayoutDevice())
+{
+DrawNormalStateKey();
+}
 DrawHighlightKey();
 // remove DrawBubble() into HandlePointerDownEventL()
 // to avoid showing more than one bubble at the same time.
 //        iKeyboard->DrawBubble(iKeyInfo);
 // When key down, latch key won't generate event.
 eventType = iKeyInfo->Latched() ? EEventVirtualKeyLatched : EEventVirtualKeyUnLatched;
 }
 if(UiLayout()->NotDrawToLayoutDevice())
 {
-//no need to draw again, just remove the highlight bitmap
+if(!iKeyInfo->Latched())
-UpdateChangedArea(EFalse);
+	{
-		Draw();
+	//no need to draw again, just remove the highlight bitmap
+UpdateChangedArea(EFalse);
+	}
+// no need to draw the normal key to layout bitmap since the highlighted key bitmap is drawn in a seperate device instead of layout device
+// so just notify the PEN UI to simply remove the highlighted key bitmap. It will somehow improve the performance and decrease the CPU usage
+		//Draw();
 }
 else
 {
 ReDraw();
 UpdateAreaImmed( Rect() );

branch	RCL_3
changeset 50	5a1685599b76
parent 46	bd83ceabce89
child 56	8152b1f1763a