MCL/sf/mw/inputmethods: comparison textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutmultilineicfeditor.cpp

equal deleted inserted replaced

-:ac7e4d1d9209
+:ebd48d2de13c
 #include "AknEdwinFormExtendedInterfaceProvider.h"
 #include "AknCompositeInlineTextSource.h"
 #include "peninputlayoutsmiley.h"
 #include <gdi.h>
-#include <e32std.h>
-#include <e32const.h>
 const TInt KParagraphSeperator = 0x2029;
 const TInt KSecretUpdateTimer = 1000000; // 1s
 const TInt KSecretInstantShowTimer = 100000; // 100ms
 const TUint16 KSegment = 0x0020;
 // separator between prompt text and normal text,
 // should use localized character soon
-//const TUint16 KSeparator = 0x003a;
+const TUint16 KSeparator = 0x003a;
-//const TUint16 KSeparatorcn = 0xff1a;
+const TUint16 KSeparatorcn = 0xff1a;
-const TUint16 KColon = 0x003a;
-const TUint16 KColoncn = 0xff1a;
 _LIT(KLineSeparator, "\n");
 const TInt KStar = '*';
 const TInt KMaxMfneDataLen = 30;
 // Message bubble position adjust
 const TInt KMsgBubblePosAdjustValueX = 3;
 const TInt KMsgBubblePosAdjustValueY = 2;
 const TInt KPromptAdjustLen = 5;
-// Tooltip position adjust
-const TInt KTooltipPosAdjustValueY = 5;
 EXPORT_C CFepLayoutMultiLineIcfEditor* CFepLayoutMultiLineIcfEditor::NewL(TRect aRect,
 CFepUiLayout* aUiLayout,
 TInt aControlId,
 TInt aFontHeight,
 TInt aMaxFontHeight,
 #ifdef RD_TACTILE_FEEDBACK
 //register the area for tactile feedback
 if(aUiLayout)
 	{
 	//Advanced Tactile feedback REQ417-47932
-	SetTactileFeedbackType(ETouchFeedbackSensitiveInput);
+	SetTactileFeedbackType(ETouchFeedbackSensitiveKeypad);
-	aUiLayout->RegisterFeedbackArea(reinterpret_cast<TInt>(this),aRect,ETouchFeedbackSensitiveInput);
+	aUiLayout->RegisterFeedbackArea(reinterpret_cast<TInt>(this),aRect,ETouchFeedbackSensitiveKeypad);
 	}
 #endif //RD_TACTILE_FEEDBACK
 }
 CFepLayoutMultiLineIcfEditor::~CFepLayoutMultiLineIcfEditor()
 if(iFormExtendedInterfaceProvider)
 {
 delete iFormExtendedInterfaceProvider;
 iFormExtendedInterfaceProvider = NULL;
 }
-iCoeEnv->ScreenDevice()->ReleaseFont(CONST_CAST(CFont*, iFont));
 delete iSmileyManager;
 }
-void CFepLayoutMultiLineIcfEditor::InitTextLayoutL(const CFont *aFont)
+void CFepLayoutMultiLineIcfEditor::InitTextLayoutL()
 {
 	iParaFormatLayer=CParaFormatLayer::NewL();
 	iCharFormatLayer=CCharFormatLayer::NewL();
 	iRichText = CRichText::NewL(iParaFormatLayer, iCharFormatLayer);
 // when (screen resolution changed)
 //iCtrl = new (ELeave) CCoeControl;
 //iCtrl->SetContainerWindowL(*iWin);
 //iWin->Construct(iCoeEnv->RootWin(),reinterpret_cast<TInt>(iCtrl));
 //ctrl->SetExtent(iViewRect.iTl, iViewRect.Size());
-SetFontL(aFont);
 	iTextView = CTextView::NewL(iLayout,
 	                            iViewRect,
 		BitmapDevice(),
 		iCoeEnv->ScreenDevice(),
 		iWin,
 CleanupStack::PopAndDestroy(paraFormat);
 iAlignment = aAlignment;
 }
-void CFepLayoutMultiLineIcfEditor::BaseConstructL(TInt /*aFontHeight*/,
+void CFepLayoutMultiLineIcfEditor::BaseConstructL(TInt aFontHeight,
-TInt /*aMaxFontHeight*/,
+TInt aMaxFontHeight,
 const CFont* aFont)
 {
 CFepUiBaseCtrl::BaseConstructL();
 iCoeEnv = CCoeEnv::Static();
 //iMaxFontHeight = aMaxFontHeight;
 //iFontHeight = aFontHeight;
 //iFont = aFont;
-InitTextLayoutL(aFont);
+InitTextLayoutL();
 iInsertionPoint = UiLayout()->CreateCursor();
 iInsertionPoint->SetOwner(this);
-//SetFontL(aFont);
+SetFontL(aFontHeight, aMaxFontHeight, aFont);
 iSecretTextTimer = CPeriodic::NewL(CActive::EPriorityStandard);
 SetAutoCompleteTextColor(KRgbGray);
 }
 }
 void CFepLayoutMultiLineIcfEditor::RecalculatePosByNewPromptTextL(const TDesC& aNewPromptText)
 {
+// recalculate cursor pos
 AdjustSelectionL(TCursorSelection(iTextView->Selection().iCursorPos + aNewPromptText.Length() - iPromptTextLen,
 iTextView->Selection().iAnchorPos + aNewPromptText.Length() - iPromptTextLen));
 // set new cursor position
 iPreInlineEndPos += (aNewPromptText.Length() - iPromptTextLen);
 iPreAutoStartPos += (aNewPromptText.Length() - iPromptTextLen);
 iPreAutoEndPos += (aNewPromptText.Length() - iPromptTextLen);
 iPreTextSelStartPos += (aNewPromptText.Length() - iPromptTextLen);
 iPreTextSelEndPos += (aNewPromptText.Length() - iPromptTextLen);
 }
 const HBufC* CFepLayoutMultiLineIcfEditor::PromptText()
 	{
 	return iPromptText;
 	}
 void CFepLayoutMultiLineIcfEditor::SetPromptTextL(const TDesC& aPromptText, TBool aCleanContent)
 {
 if ( aCleanContent )
 	{
 	//clean all the content (include prompt text) on the ICF
 TInt length = iRichText->DocumentLength();
 iRichText->DeleteL( 0,  length);
 	iTextView->SetSelectionL( TCursorSelection(0, 0) );
 	iCursorSel = TCursorSelection(0, 0);
 iNoMatchState = EFalse;
 	}
 else
 {
-if ( ( ( !iInitPromptText && aPromptText.Length() == 0 ) )||
+/*if ( ( ( !iInitPromptText && aPromptText.Length() == 0 ) )||
 ( iInitPromptText && *iInitPromptText == aPromptText &&
 iPromptText && TextWidth(*iPromptText) <= iViewRect.Width()) )
 	    {
 	    //prompt text has not been change then need not to be reset
 	    //but iLineSeparator may be changed, need reset prompt text
-TBool newLineSeparator = iLineSeparator;
+	    return;
-if ( !iLineSeparator )
+}*/
-{
-newLineSeparator = ( TBidiText::TextDirectionality( aPromptText )
-== TBidiText:: ERightToLeft );
-}
-if ( newLineSeparator == iLineSeparator )
-{
-return;
-}
-}
 //prompt text need to be reset and not clean the content
 iRichText->DeleteL( 0,  iPromptTextLen );
 iTextView->HandleInsertDeleteL(TCursorSelection(0, 0), iPromptTextLen );
 }
 prompttextLen = aPromptText.Length() + TBidiLogicalToVisual::KMinCharAvailable + 3 :
 prompttextLen = aPromptText.Length() + TBidiLogicalToVisual::KMinCharAvailable + 2;
 iPromptText = HBufC::NewL(prompttextLen);
 TPtr text = iPromptText->Des();
-TBuf<1> ptrEllipsis;
+TBuf<1> ptr0;
-ptrEllipsis.Append( KEllipsis );
+ptr0.Append( KEllipsis );
-TPtrC ptrSpace(&KSegment, 1);
+TPtrC ptr1(&KSegment, 1);
-TPtrC ptrColon(&KColon, 1);
+TPtrC ptr2(&KSeparator, 1);
-TInt separatorLen = TextWidth(ptrSpace) + TextWidth(ptrColon) + TextWidth(ptrEllipsis);
+TInt separatorLen = TextWidth(ptr1) + TextWidth(ptr2) + TextWidth(ptr0);
-TInt textWidth = TextWidth(aPromptText);
+TInt textWidth = TextWidth(aPromptText) + separatorLen;
+TBool ret = EFalse;
-if ((aPromptText.LocateReverse(KColon) != aPromptText.Length() - 1) &&
-(aPromptText.LocateReverse(KColoncn) != aPromptText.Length() - 1))
+if (textWidth >= iViewRect.Width() )
 {
-textWidth += TextWidth(ptrSpace) + TextWidth(ptrColon);
+ret = ETrue;
-}
-else
-{
-textWidth += TextWidth(ptrSpace);
-}
-TBool truncated = EFalse;
-if (textWidth > iViewRect.Width() )
-{
-truncated = ETrue;
 AknBidiTextUtils::ConvertToVisualAndClip(aPromptText,
 text,
 *iFont,
 iViewRect.Width() - separatorLen - KPromptAdjustLen,
 iViewRect.Width() - separatorLen - KPromptAdjustLen,
 	for ( ;(text.Length() > 0 && text.LocateReverse(KSegment) == text.Length()-1 ); )
 	    {
 		text.Delete( text.Length()-1, 1 );
 	    }
-if ((text.LocateReverse(KColon) != text.Length() - 1) &&
+if ((text.LocateReverse(KSeparator) != text.Length() - 1) &&
-(text.LocateReverse(KColoncn) != text.Length() - 1))
+(text.LocateReverse(KSeparatorcn) != text.Length() - 1))
 {
 // if sent prompt text already include separator, then no need to
 // append it again
-if (truncated)
+if ( ret )
 {
-text.Append( ptrEllipsis );
+text.Append( ptr0 );
 }
-text.Append(ptrColon);
+text.Append(ptr2);
 }
-else if (truncated)
+else if ( ret )
 {
-text.Insert( text.Length()-1, ptrEllipsis );
+text.Insert( text.Length()-1, ptr0 );
 }
-text.Append(ptrSpace); // segment between prompt text and official text
+text.Append(ptr1); // segment between prompt text and official text
 textWidth = TextWidth(text);
 iRichText->InsertL(0, text);
 iTextView->HandleInsertDeleteL(TCursorSelection(0, text.Length()),
 0);
 {
 TInt delLen = iRichText->DocumentLength() - iPromptTextLen;
 iRichText->DeleteL(iPromptTextLen, delLen );
 iTextView->HandleInsertDeleteL(TCursorSelection(iPromptTextLen, iPromptTextLen),
 delLen);
-iTextView->SetSelectionL(TCursorSelection(iPromptTextLen, iPromptTextLen));
 }
 ptr.Copy(icfdata.iText);
 }
 break;
 case EPeninputICFReplace:
 {
 iCursorSel.iCursorPos = icfdata.iCurSel.iCursorPos + iPromptTextLen;
 iCursorSel.iAnchorPos = icfdata.iCurSel.iAnchorPos + iPromptTextLen;
 DrawMfneText();
 iSynCursor = EFalse;
-iOldMfneText.Close();
 iOldMfneText.CreateL(ptr);
 }
 iInsertionPoint->SetVisible( EFalse );
 iInsertionPoint->DelayCursorShown();
 }
 AdjustSelectionL( icfdata.iCurSel );
 RecalcualteTextPositionL();
-//SetMsgBubbleRect();
+SetMsgBubbleRect();
-SetMsgBubbleRectAccordingToLanguage();
 Draw();
 }
 break;
 case EPeninputICFReplace:
 {
 iHideBubbleTemp = EFalse;
 }
 }
 else
 {
-//SetMsgBubbleRect();
+SetMsgBubbleRect();
-		SetMsgBubbleRectAccordingToLanguage();
 SetInfoBubbleRect();
 }
 }
 TBool CFepLayoutMultiLineIcfEditor::HighlightOverlapWithBubble( const TRect& aRect )
 editArea->iSecretTextTimer->Cancel();
 return KErrNone;
 }
 TPtrC icftext = editArea->iRichText->Read(editArea->iPromptTextLen,
 editArea->iRichText->DocumentLength());
+TInt startPos = icftext.LocateReverse(KStar) + 1 + editArea->iPromptTextLen;
-for (TInt i = 0; i < icftext.Length(); i++)
-{
+TBuf<1> buf;
-if (icftext[i] != KStar)//find only one none-star char
+buf.Append(KStar);
-{
-TInt startPos = i + editArea->iPromptTextLen;
+TInt textlen = editArea->iRichText->DocumentLength();
-TBuf<1> buf;
-buf.Append(KStar);
+if (startPos < textlen)
+{
-TInt textlen = editArea->iRichText->DocumentLength();
+editArea->iRichText->DeleteL(startPos, 1);
+editArea->iTextView->HandleInsertDeleteL(TCursorSelection(startPos, startPos), 1);
-if (startPos < textlen)
+editArea->iRichText->InsertL(startPos, buf);
-{
+editArea->iTextView->HandleInsertDeleteL(TCursorSelection(startPos, startPos+buf.Length()),
-editArea->iRichText->DeleteL(startPos, 1);
+0);
-editArea->iTextView->HandleInsertDeleteL(TCursorSelection(
-startPos, startPos), 1);
+if (startPos == textlen - 1)
-editArea->iRichText->InsertL(startPos, buf);
+{
-editArea->iTextView->HandleInsertDeleteL(TCursorSelection(
+editArea->iSecretTextTimer->Cancel();
-startPos, startPos + buf.Length()), 0);
+}
+}
-if (startPos == textlen - 1)
-{
-editArea->iSecretTextTimer->Cancel();
-}
-}
-break;
-}
-}
-if ( editArea->iCursorVisible )
-	{
-editArea->SetSelectionL( editArea->iCursorSel );
-editArea->Draw();
-	}
 editArea->UpdateArea(editArea->Rect(),EFalse);
 return KErrNone;
 }
 void CFepLayoutMultiLineIcfEditor::UpdateSecretTextL()
 void CFepLayoutMultiLineIcfEditor::SetDimmed(TBool aDimFlag)
 {
 iDimmed = aDimFlag;
 }
-void CFepLayoutMultiLineIcfEditor::SetFontL(const CFont* aFont)
+void CFepLayoutMultiLineIcfEditor::SetFontL(TInt aFontHeight,
-{
+TInt aMaxFontHeight,
-TInt newHeightInPixel = iCoeEnv->ScreenDevice()->VerticalPixelsToTwips(aFont->HeightInPixels());
+const CFont* aFont)
+{
+TInt newHeightInPixel = iCoeEnv->ScreenDevice()->VerticalPixelsToTwips(aFontHeight);
 TInt OldHeightInPixel = iCoeEnv->ScreenDevice()->VerticalPixelsToTwips(iFontHeight);
 if( newHeightInPixel == OldHeightInPixel )
 {
 return;
 else
 {
 iFormatChange = ETrue;
 }
-TFontSpec fontSpec;
+iMaxFontHeight = aMaxFontHeight;
-fontSpec = aFont->FontSpecInTwips();
+iFontHeight = aFontHeight;
-fontSpec.iHeight = aFont->HeightInPixels();
+iFont = aFont;
-CFont*  font;
-iCoeEnv->ScreenDevice()->ReleaseFont(CONST_CAST(CFont*, iFont));
-iCoeEnv->ScreenDevice()->GetNearestFontInPixels((CFont*&)font,fontSpec);
-iMaxFontHeight = font->FontMaxHeight();
-iFontHeight = font->HeightInPixels();
-iFont = font;
 iCharFormatMask.ClearAttrib( EAttFontUnderline );
 iCharFormatMask.SetAttrib(EAttFontHeight);
 iCharFormatMask.SetAttrib(EAttFontStrokeWeight);
 iCharFormatMask.SetAttrib(EAttFontTypeface);
 iCharFormat.iFontSpec.iHeight = iCoeEnv->ScreenDevice()->VerticalPixelsToTwips(iFontHeight);
 iCharFormat.iFontSpec.iFontStyle.SetStrokeWeight(EStrokeWeightNormal);
 iCharFormat.iFontSpec.iFontStyle.SetBitmapType(EAntiAliasedGlyphBitmap);
-iCharFormat.iFontSpec.iTypeface = iFont->FontSpecInTwips().iTypeface;
 iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, 0, iRichText->DocumentLength());
 if( InlineStateOn() || AutoCompletionStateOn() )
 {
 iCharFormatMask.ClearAll();
 iCharFormatMask.SetAttrib( EAttFontUnderline );
 iCharFormat.iFontPresentation.iUnderline = EUnderlineOn ;
-if( iPreInlineStartPos >= 0 && iPreInlineEndPos <= iRichText->DocumentLength() + 1 )
+iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, iPreInlineStartPos,
-{
+iPreInlineEndPos - iPreInlineStartPos);
-iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, iPreInlineStartPos,
-iPreInlineEndPos - iPreInlineStartPos);
-}
 }
 //iRichText->SetInsertCharFormatL(iCharFormat, iCharFormatMask, iRichText->DocumentLength() - iPromptTextLen);
 SetPromptTextFormatL( iPromptTextLen );
 {
 gc->Clear(Rect());
 TRect innerrect = Rect();
 	    //innerrect.Shrink(4, 4);
-AknsDrawUtils::DrawFrame(UiLayout()->SkinInstance(),
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(),
 		                         *gc,
 		                         Rect(),
 		                         innerrect,
 		                         BgImgSkinId(),
 		                         KAknsIIDDefault);
 iInsertionPoint->SetPosition( TPoint(rect.iTl.iX + width1 + iOffset,rect.iTl.iY ));
 TInt baseLine = iFont->AscentInPixels()/2 + rect.Height()/2;
 TRect clipRect =
-TRect( TPoint(Rect().iTl.iX + 1, rect.iTl.iY), TPoint( Rect().iBr.iX - 1, rect.iBr.iY));
+TRect( TPoint(Rect().iTl.iX, rect.iTl.iY), TPoint( Rect().iBr.iX, rect.iBr.iY));
 gc->SetClippingRect( clipRect );
 gc->Clear( clipRect );
 DrawOpaqueMaskBackground( clipRect );
 DrawBackground( clipRect );
 if (iSkinIdSet)
 {
-		AknsDrawUtils::DrawFrame(UiLayout()->SkinInstance(),
+		AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(),
 	                         *gc,
 	                         Rect(),
 	                         Rect(),
 	                         BgImgSkinId(),
 	                         KAknsIIDDefault);
 TRAP_IGNORE(iTextView->SetViewLineAtTopL( iLineNumber+1 ));
 }
 }
 TRAP_IGNORE(RecalcualteTextPositionL());
+SetMsgBubbleRect();
-//SetMsgBubbleRect();
-SetMsgBubbleRectAccordingToLanguage();
 }
 void CFepLayoutMultiLineIcfEditor::ResetViewHeightL()
 {
 const TInt height = iLayout->FormattedHeightInPixels();
 	{
 	iViewRect.iBr.iY -= margin;
 	}
 iTextView->SetViewRect(iViewRect);
 }
-void CFepLayoutMultiLineIcfEditor::SetMsgBubbleRectAccordingToLanguage()
-	{
-	if ( iPreLanguageID == ELangPrcChinese ||
-		 iPreLanguageID == ELangHongKongChinese ||
-		 iPreLanguageID == ELangTaiwanChinese ||
-		 iPreLanguageID == ELangKorean )
-		{
-		SetMsgBubbleRect();
-		return;
-		}
-	else
-		{
-		if(( !iMsgBubble->IsShowing() && !iHideBubbleTemp ) ||
-				iLineMaxCount < 1 || iCursorSel.iCursorPos < 0 )
-			{
-			return;
-			}
-		iMsgBubble->Popup( iMsgBubble->Rect());
-		iHideBubbleTemp = EFalse;
-		return;
-		}
-	}
 void CFepLayoutMultiLineIcfEditor::SetMsgBubbleRect()
 {
 if( ( !iMsgBubble->IsShowing() && !iHideBubbleTemp ) ||
 iLineMaxCount < 1 || iCursorSel.iCursorPos < 0 )
 {
 TPoint leftTop = TPoint(Rect().iBr.iX-iInfoBubble->Rect().Width(),Rect().iTl.iY);
 iInfoBubble->SetRect( TRect(leftTop,aSize) ) ;
 }
-void CFepLayoutMultiLineIcfEditor::ShowTooltipL( const TDesC& aText,
+void CFepLayoutMultiLineIcfEditor::ShowTooltipL(const TDesC& aText)
-		                                         const TRect& aRect,
-		                                         TInt aLangCode )
 	{
 	if ( !iTooltip )
 	    {
 	    return;
 	    }
 iTooltip->SetTextL( aText );
-iTooltip->SetLangCode( aLangCode );
+TPoint tl = iInsertionPoint->Position();
-TPoint tl( 0, 0 ), br( 0, 0 );
-InlineTextPos( tl, br );
 if ( iLineMaxCount > 1 )
 	    {
 		TBool firstLine =  iLayout->FirstLineInBand() == iLineNumber;
 		if ( firstLine )
 		    {
-		    tl.iY += KTooltipPosAdjustValueY;
+			tl.iY += iInsertionPoint->Height();
 			}
 		else
 		    {
-			tl.iY -= ( iFormatLineHeight + aRect.Height() - KTooltipPosAdjustValueY );
+			tl.iY -= iTooltip->Rect().Height();
 			}
 		}
+TRect tooltipRect = TRect( tl, iTooltip->Rect().Size() );
-TRect tooltipRect = TRect( tl, aRect.Size() );
-// Make sure the right border of tooltip isn't be out of icf rect
 TInt moveX = tooltipRect.iBr.iX - Rect().iBr.iX;
 if ( moveX > 0 )
 	{
 	tooltipRect.iBr.iX -= moveX;
 	tooltipRect.iTl.iX -= moveX;
 	}
-// Make sure tooltip isn't overlapped by msg bubble.
 	if ( tooltipRect.Intersects( iMsgBubble->Rect() ) )
 	    {
 		moveX = tooltipRect.iBr.iX - iMsgBubble->Rect().iTl.iX;
 		if ( moveX > 0 && tooltipRect.iTl.iX - moveX >= Rect().iTl.iX )
 	    	{
 		if ( moveX > 0 && tooltipRect.iBr.iX + moveX <= Rect().iBr.iX )
 	    	{
 	    	tooltipRect.iBr.iX += moveX;
 	    	tooltipRect.iTl.iX += moveX;
 	    	}
-	    }
-	if (( iTooltip->Rect().iTl != tooltipRect.iTl ) && ( iTooltip->Rect().iBr != tooltipRect.iBr ))
-	    {
-iTooltip->Close();
 	    }
 iTooltip->Popup( tooltipRect );
 	}
 void CFepLayoutMultiLineIcfEditor::HideTooltip()
 	{
 }
 }
 }
 void CFepLayoutMultiLineIcfEditor::SizeChangedL(const TRect& aRect,
-TInt /*aFontHeight*/,
+TInt aFontHeight,
-TInt /*aMaxFontHeight*/,
+TInt aMaxFontHeight,
 const CFont* aFont)
 {
 TRect oriRect = Rect();
 AdjustBmpDeviceIfNeeded();
 // apply font formats
-SetFontL( aFont);
+SetFontL(aFontHeight, aMaxFontHeight, aFont);
 if ( !iFormatChange && oriRect == aRect )
 {
 return;
 }
 AdjustPromptTextL();
 iLayout->SetAmountToFormat(CTextLayout::EFFormatAllText);
-//    if ( iFormatChange )
+if ( iFormatChange )
-//        {
+{
-//        iTextView->HandleGlobalChangeNoRedrawL();
+iTextView->HandleGlobalChangeNoRedrawL();
-//        }
+}
 TBool ready = Ready();
 if( ready )
 {
 SetReady( EFalse );
 	if( ready )
 	    {
 	    SetReady( ETrue );
 	    }
-//    if ( iFormatChange )
+if ( iFormatChange )
-//        {
+{
-//        iTextView->SetSelectionL( iTextView->Selection() );
+iTextView->SetSelectionL( iTextView->Selection() );
-//        RecalcualteTextPositionL();
+RecalcualteTextPositionL();
-//        SetMsgBubbleRect();
+SetMsgBubbleRect();
-//        Draw();
+Draw();
-//        }
+}
-		iTextView->HandleGlobalChangeNoRedrawL();
-		iTextView->SetSelectionL( iTextView->Selection() );
-		RecalcualteTextPositionL();
-		//SetMsgBubbleRect();
-		SetMsgBubbleRectAccordingToLanguage();
-		Draw();
 }
 TBool CFepLayoutMultiLineIcfEditor::BelongToPromptText(TInt aPos)
 {
 if (!iPromptText || iPromptText->Length() == 0 )
 }
 break;
 case CFepLayoutMultiLineIcf::EIcfAutoComplete:
 {
-if ( iTextView->Selection().iCursorPos >= iPreInlineStartPos
+if (iTextView->Selection().iCursorPos >= iPreInlineStartPos &&
-&& iTextView->Selection().iCursorPos < iPreAutoEndPos )
+iTextView->Selection().iCursorPos < iPreInlineEndPos )
 {
 iPntDownOnInline = ETrue;
 CapturePointer(EFalse);
 if (iTooltip && iTooltip->IsShowing())
 {
 else
 {
 ReportEvent(EEventPointerDownOnInline);
 }
 }
+else
+{
+// do nothing
+//submit autocomplete when set text
+if (iTooltip && !iTooltip->IsShowing())
+{
+	            ReportEvent( EEventControlFocusGained );
+UiLayout()->SignalOwner( ESignalCommitITIInlineText );
+			        SetInlineStateL( EFalse, iPreInlineStartPos, iPreInlineEndPos );
+			        SetAutoCompleteStateL( EFalse );
+}
+}
 }
 break;
 case CFepLayoutMultiLineIcf::EIcfNormal:
 		{
 		    if (preCursorPos != iCursorSel.iCursorPos)
 {
 TInt cursorPos = iFont->TextCount(iMfneIcfData->Des(), aPt.iX - iViewRect.iTl.iX - iOffset );
 iCursorSel = TCursorSelection(cursorPos+iPromptTextLen,
 iCursorSel.iAnchorPos);
 AdjustFepCursorPosForPromptText( ETrue );
-TAmPmName amName(EAm);
-TAmPmName pmName(EPm);
-TInt offset = iMfneIcfData->Find(amName)!= KErrNotFound?
-iMfneIcfData->Find(amName):iMfneIcfData->Find(pmName);
-	    //if current is 12-hour format and touch on correct position
-if(offset != KErrNotFound &&
-iCursorSel.LowerPos()-iPromptTextLen>= offset &&
-iCursorSel.LowerPos()-iPromptTextLen<= offset+amName.Length())
-{
-UiLayout()->SignalOwner(ESignalChangeAmPm);
-}
 return this;
 }
 if (!iPntDownOnInline)
 {
 iTooltip->Hide(ETrue);
 }
 else
 {
 AdjustFepCursorPosForPromptText( !iPntDownOnInline );
+if(iState != CFepLayoutMultiLineIcf::EIcfNormal)
+{
+UiLayout()->SignalOwner( ESignalStartInlineText );
+}
 }
 }
 iPntDownOnInline = EFalse;
 #ifdef RD_TACTILE_FEEDBACK
 if (UiLayout()->SupportTactileFeedback())
 {
 if ( iLastCursorPos != iCursorSel.iCursorPos )
 {
-UiLayout()->DoTactileFeedback(ETouchFeedbackEdit);
+UiLayout()->DoTactileFeedback(ETouchFeedbackSensitiveKeypad);
 iLastCursorPos = iCursorSel.iCursorPos;
 }
 }
 #endif //RD_TACTILE_FEEDBACK
 iCharFormatMask.SetAttrib( EAttFontUnderline );
 iCharFormatMask.SetAttrib( EAttColor );
 iCharFormat.iFontPresentation.iTextColor = iTextColor;
 // set prompt text as bold
-if( aPromptTextLen <= iRichText->DocumentLength() + 1)
+iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, 0, aPromptTextLen );//- 1
-{
-iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, 0, aPromptTextLen );//- 1
-}
 iTextView->HandleRangeFormatChangeL(TCursorSelection(0, aPromptTextLen ), ETrue);//- 1
 // set remain text as non-bold
 iCharFormat.iFontSpec.iFontStyle.SetStrokeWeight(EStrokeWeightNormal);
 //iRichText->SetInsertCharFormatL(iCharFormat, iCharFormatMask, aPromptTextLen - 1);
 return;
 }
 iCharFormatMask.SetAttrib(aAttribute);
-// comment for updating format anyway.
+if (IsTextPosValid(aPreStartPos) && IsTextPosValid(aPreEndPos))
-//if (IsTextPosValid(aPreStartPos) && IsTextPosValid(aPreEndPos))
+{
-//{
+iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, 0,
-iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, 0,
 iRichText->DocumentLength());
 //iTextView->HandleRangeFormatChangeL(TCursorSelection(aPreStartPos, aPreEndPos), ETrue);
-//}
+}
 aPreStartPos = 0;
 aPreEndPos = 0;
 if (aStateOn)
 {
 iCharFormat.iFontPresentation.iTextColor = iTextAutoColor;
 }
 iCharFormatMask.SetAttrib(aAttribute);
-TInt aPos = Min( aStartPos, aEndPos );
-TInt aLength = Abs( aEndPos - aStartPos );
 if (aNoMatchState)
 {
-if ( aPos >= 0 && aPos + aLength <= iRichText->DocumentLength())
+iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask,
-{
+Min(aStartPos,aEndPos), Abs( aEndPos - aStartPos ) + 1);
-iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, aPos, aLength + 1);
+iTextView->HandleRangeFormatChangeL(TCursorSelection(aStartPos, aEndPos + 1), ETrue);
-iTextView->HandleRangeFormatChangeL(TCursorSelection(aStartPos, aEndPos + 1), ETrue);
-}
 }
 else
 {
-if ( aPos >= 0 && aPos + aLength <= iRichText->DocumentLength() + 1 )
+iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask,
-{
+Min(aStartPos,aEndPos), Abs( aEndPos - aStartPos ) );
-iRichText->ApplyCharFormatL(iCharFormat, iCharFormatMask, aStartPos, aLength );
+iTextView->HandleRangeFormatChangeL(TCursorSelection(aStartPos, aEndPos), ETrue);
-iTextView->HandleRangeFormatChangeL(TCursorSelection(aStartPos, aEndPos), ETrue);
-}
 }
 aPreStartPos = aStartPos;
 aPreEndPos = aEndPos;
 }
 void CFepLayoutMultiLineIcfEditor::ShowBubble(const TDesC& aText, const TRect& /*aRect*/)
 {
 TRAP_IGNORE(iMsgBubble->SetTextL(aText));
 iHideBubbleTemp = ETrue;
-//SetMsgBubbleRect();
+SetMsgBubbleRect();
-SetMsgBubbleRectAccordingToLanguage();
 }
 void CFepLayoutMultiLineIcfEditor::ShowByteWarningBubble(const TDesC& aInfo)
 {
 TSize size = iInfoBubble->Rect().Size();
-CFont::TMeasureTextInput input;// = new (ELeave) CFont::TMeasureTextInput;
+CFont::TMeasureTextInput*  input = new (ELeave) CFont::TMeasureTextInput;
-input.iMaxBounds = iRect.Width();
+CleanupStack::PushL(input);
-TInt width = iFont->MeasureText(aInfo, &input, NULL);
+input->iMaxBounds = iRect.Width();
+TInt width = iFont->MeasureText(aInfo, input, NULL);
+CleanupStack::PopAndDestroy();
 size.SetSize(width, size.iHeight);
 SetInfoBubbleCtrlSize(size);
 TRAP_IGNORE(iInfoBubble->SetTextL(aInfo));
 iHideInfoBubbleTemp = ETrue;
 SetInfoBubbleRect();
 void CFepLayoutMultiLineIcfEditor::ApplyFormatL()
 {
 if( !iFormatChange )
 {
-return ;
+return;
 }
 //apply line space
 CParaFormat* paraFormat=CParaFormat::NewL();
 CleanupStack::PushL( paraFormat );
 TParaFormatMask paraFormatMask;
 }
 }
 void CFepLayoutMultiLineIcfEditor::ResetApplyFont()
 {
-//TInt fontHeight = iFontHeight;
+TInt fontHeight = iFontHeight;
-//TInt maxFontHeight = iMaxFontHeight;
+TInt maxFontHeight = iMaxFontHeight;
 const CFont *font = iFont;
 iFontHeight = 0;
-TRAP_IGNORE(SetFontL(font));
+TRAP_IGNORE(SetFontL(fontHeight, maxFontHeight, font));
 }
 void CFepLayoutMultiLineIcfEditor::TryDisplayMaxTextL( TInt aCursorPos )
 {
 iTextView->FinishBackgroundFormattingL();
 CalculateCursorPos(cursorPt);
 if ( !iViewRect.Contains( cursorPt ) && ( lineIndex + 1 ) > ( iLineMaxCount - 1 ) )
 {
 iTextView->SetViewLineAtTopL(( lineIndex + 1 ) - ( iLineMaxCount - 1 ));
 RecalcualteTextPositionL();
-//SetMsgBubbleRect();
+SetMsgBubbleRect();
-SetMsgBubbleRectAccordingToLanguage();
 }
 }
 const TInt lineCount = iLayout->NumFormattedLines();
 iTextView->SetViewLineAtTopL(
 lineCount - pageCount + 1 < 1 ? 1 : lineCount - pageCount + 1 );
 RecalcualteTextPositionL();
-//SetMsgBubbleRect();
+SetMsgBubbleRect();
-SetMsgBubbleRectAccordingToLanguage();
 }
 }
 }
 void CFepLayoutMultiLineIcfEditor::DrawIcfBackground( CFbsBitGc& /*aGc*/, const TRect& aDrawnRect,
 iCursorSel = aCurSel;
 if ( BelongToPromptText(aCurSel.iCursorPos) )
 {
-//why to use iPromptText->Length() instead of iPromptTextLen
+//pls refer to bug: ELWG-7MZ5EZ, why to use iPromptText->Length() instead of iPromptTextLen
 //iCursorSel.iCursorPos = iPromptTextLen;
 iCursorSel.iCursorPos = iPromptText->Length();
 }
 if ( BelongToPromptText(aCurSel.iAnchorPos) )
 {
-//why to use iPromptText->Length() instead of iPromptTextLen
+//pls refer to bug: ELWG-7MZ5EZ, why to use iPromptText->Length() instead of iPromptTextLen
 //iCursorSel.iAnchorPos = iPromptTextLen;
 iCursorSel.iAnchorPos = iPromptText->Length();
 }
 iTextView->SetSelectionL( iCursorSel );
 {
 return iSmileyManager;
 }
 void CFepLayoutMultiLineIcfEditor::CalcSmileyClipRegionL( RRegion& aRgn,
-CGraphicsContext& /*aGc*/,
+CGraphicsContext& aGc,
 CFont& aFont,
 const TDesC& aText,
 TPoint& aBasePoint,
 TInt aTopLine,
 TInt aBottomLine )
 TInt code = text[i];
 CPeninputSmileyImage* smiley = iSmileyManager->SmileyImage( code );
 if ( smiley )
 {
+gc.SetBrushColor( TRgb(255,0,0) );
 gc.SetBrushStyle( CGraphicsContext::ENullBrush );
 smiley->SetImageSize( rect.Size() );
 if ( smiley->MaskBitmap() )

branch	RCL_3
changeset 20	ebd48d2de13c
parent 19	ac7e4d1d9209
child 21	ecbabf52600f