--- a/textinput/peninputvkbcn/ctrlsrc/peninputvkbclientarea.cpp Wed Sep 01 12:23:33 2010 +0100
+++ b/textinput/peninputvkbcn/ctrlsrc/peninputvkbclientarea.cpp Tue Sep 14 21:59:06 2010 +0300
@@ -952,6 +952,10 @@
TRect compositionRect;
TRect innerRect;
+ // Get composition area rect from laf
+ TRect compositionAreaFromLaf = iLafMgr->compositionLayoutData();
+ TInt GapValue = compositionAreaFromLaf.iTl.iX;
+
if (range == ERangeNative)
{
if ( layoutType == EAknFepVkbImCnZhuyin )
@@ -1004,13 +1008,17 @@
}
compositionRect.iTl = TPoint(optionRect.iBr.iX, optionRect.iTl.iY);
- compositionRect.SetSize(TSize(btnWidth * 3 + iCellAidGap, candidateHeight));
+ compositionRect.SetSize(TSize(btnWidth * 3 + iCellAidGap - GapValue,
+ candidateHeight));
}
- else
- {
- compositionRect.iTl = Rect().iTl;
- compositionRect.SetSize(TSize(btnWidth * 3 + iCellAidGap, candidateHeight));
- }
+ else
+ {
+ compositionRect.iTl = Rect().iTl;
+ // move the composition area rect with gap
+ compositionRect.iTl.iX += GapValue;
+ compositionRect.SetSize(
+ TSize( btnWidth * 3 + iCellAidGap - GapValue * 2, candidateHeight ));
+ }
iCompositionField->SetReady(ETrue);
iCompositionField->Hide(EFalse);
iCompositionField->SizeChanged(compositionRect);
@@ -1049,6 +1057,8 @@
}
else
{
+ // move the gap
+ compositionRect.iTl.iX -= GapValue;
iVkbBoardLeftTop = TPoint(compositionRect.iTl.iX, compositionRect.iBr.iY);
}
}
@@ -1070,19 +1080,22 @@
vkbCtrl->SetTextFormat( iLafMgr->KeyTextLayout() ); //Read laf
TInt tempHeightForFSQ = btnHeight;
- if (UiLayout()->PenInputType() == EPluginInputModeFSQ )
- {
- tempHeightForFSQ = btnHeight + 3;
- }
+ // Modify begin
+ //if (UiLayout()->PenInputType() == EPluginInputModeFSQ )
+ // {
+ // tempHeightForFSQ = btnHeight + 3;
+ // }
TPoint rangeBarRefPoint = TPoint(vkbRect.iTl.iX, vkbRect.iBr.iY);
- rangeBarRefPoint.iY += yAxisOffset;
+ // Modify begin
+ //rangeBarRefPoint.iY += yAxisOffset;
if (range != ERangeNative)
{
TRect shiftRect;
shiftRect.iTl = TPoint(Rect().iTl.iX, vkbRect.iBr.iY);
- shiftRect.iTl.iY += yAxisOffset;
+ // Modify begin
+ //shiftRect.iTl.iY += yAxisOffset;
shiftRect.SetSize(TSize(btnWidth, tempHeightForFSQ));
AknPenImageUtils::CalculateGraphicRect( shiftRect, innerRect );
ControlById( EAknFepVkbCtrlIdShiftBtn)->SetReady(ETrue);