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

equal deleted inserted replaced

-:bd83ceabce89
+:5a1685599b76
 //iInsertionPoint->SetOn( EFalse );
 iLeadingEdge = icfdata.iLeadingEdge;
+TInt draw = icfdata.iCmd == EPeninputICFSetCurSel ? 0 : 1;
 if (icfdata.iFlag != EFepICFDataInlineNoMatch && iNoMatchState)
 {
-UpdateNoMatchTextL(iPreInlineEndPos, KNullDesC, EFalse);
+draw += UpdateNoMatchTextL(iPreInlineEndPos, KNullDesC, EFalse);
 }
 switch (icfdata.iCmd)
 {
 case EPeninputICFInitial:
 AdjustSelectionL( icfdata.iCurSel );
 RecalcualteTextPositionL();
 //SetMsgBubbleRect();
 SetMsgBubbleRectAccordingToLanguage();
-Draw();
+//            Draw();
 }
 break;
 case EPeninputICFReplace:
 {
 if (( icfdata.iStartPos < 0 ) ||
 {
 return;
 }
 }
-UpdateTextL(icfdata);
+draw += UpdateTextL(icfdata);
 // Need to set selection visible before set selection for textview
 SetCursorSelVisibility( icfdata.iCursorSelVisible );
-SetSelectionL(icfdata.iCurSel);
+draw += SetSelectionL(icfdata.iCurSel);
-ResetViewHeightL();
+draw += ResetViewHeightL();
 if (icfdata.iMidPos == 0)
 {
 // inline state
 // if there is paragraph separater inside icfdata's iText, then should not
 // set to inline state
 if (icfdata.iText.Locate(KParagraphSeperator) == KErrNotFound)
 {
-SetAutoCompleteStateL(EFalse);
+draw += SetAutoCompleteStateL(EFalse);
 icfdata.iFlag == EFepICFDataInlineNoMatch ?
-SetInlineStateL(ETrue, icfdata.iStartPos,
+draw += SetInlineStateL( ETrue, icfdata.iStartPos,
 icfdata.iCurSel.iCursorPos,
-ETrue, icfdata.iText) :
+							                 ETrue, icfdata.iText) :
-SetInlineStateL(ETrue, icfdata.iStartPos,
+draw += SetInlineStateL(ETrue, icfdata.iStartPos,
 icfdata.iCurSel.iCursorPos);
 }
 }
 else if (icfdata.iMidPos > 0)
 {
 // auto complete state
 // Q: does insertion point need to be shown when auto complete?
 // on the assumption that insertion point do not shown
-SetAutoCompleteStateL( ETrue, icfdata.iStartPos,
+draw += SetAutoCompleteStateL( ETrue, icfdata.iStartPos,
 icfdata.iStartPos + icfdata.iText.Length() - icfdata.iMidPos,
 icfdata.iCurSel.iCursorPos );
 }
 else
 {
 // icfdata.iMidPos < 0, normal state
 //
-SetInlineStateL(EFalse, icfdata.iStartPos, icfdata.iCurSel.iCursorPos);
+draw += SetInlineStateL(EFalse, icfdata.iStartPos, icfdata.iCurSel.iCursorPos);
-SetAutoCompleteStateL(EFalse);
+draw += SetAutoCompleteStateL(EFalse);
 }
 // after inline adjust, cusor position may be updated
 if( bScroll )
 {
-TryDisplayMaxTextL(iCursorSel.iCursorPos);
+draw += TryDisplayMaxTextL(iCursorSel.iCursorPos);
 }
-iTextView->DrawL(iViewRect);
-//if(iMsgBubble)
-//        iMsgBubble->Draw();
 iInsertionPoint->SetVisible( EFalse );
 SetCursorVisible(icfdata.iCursorVisibility);
-if (AbleToDraw())
+if ( AbleToDraw() )
 {
-UpdateAreaImmed(Rect(),EFalse);
+if(draw > 0)
-}
+	{
-}
+iTextView->DrawL(iViewRect);
+	}
-void CFepLayoutMultiLineIcfEditor::SetSelectionL(TCursorSelection aCurSel)
-{
+UpdateAreaImmed(iViewRect,EFalse);
+}
+}
+TBool CFepLayoutMultiLineIcfEditor::SetSelectionL(TCursorSelection aCurSel)
+{
+TBool changed = EFalse;
 if ( !IsTextPosValid(aCurSel.LowerPos()) ||
 !IsTextPosValid(aCurSel.HigherPos()) )
 {
-return;
+return changed;
 }
-AdjustSelectionL( aCurSel );
+changed = AdjustSelectionL( aCurSel );
 if ( iLayout->FirstLineInBand() != 0 && iLineMaxCount > 1 &&
 iPromptTextLen > 0 && aCurSel.iCursorPos == iPromptTextLen )
 	{
-iTextView->SetViewLineAtTopL( 1 );
+if ( iTextView->SetViewLineAtTopL( 1 ) != TPoint( 0, 0 ) )
+{
+changed = ETrue;
+}
 	}
 RecalcualteTextPositionL();
 if ( iCursorSel.Length() > 0 )
 {
 if ( iMsgBubble->IsShowing() && HighlightOverlapWithBubble( iMsgBubble->Rect() )  )
 else
 {
 //SetMsgBubbleRect();
 		SetMsgBubbleRectAccordingToLanguage();
 SetInfoBubbleRect();
 }
+return changed;
 }
 TBool CFepLayoutMultiLineIcfEditor::HighlightOverlapWithBubble( const TRect& aRect )
 {
 TBool ret = EFalse;
 HideBubble();
 iHideBubbleTemp = ETrue;
 }
 // for secret editor
-void CFepLayoutMultiLineIcfEditor::UpdateTextL(const TFepInputContextFieldData& aData)
+TBool CFepLayoutMultiLineIcfEditor::UpdateTextL(const TFepInputContextFieldData& aData)
 {
 if (!iTextIsSecret)
 {
-return;
+return EFalse;
 }
 switch (aData.iCmd)
 {
 case EPeninputICFInitial:
 delLen );
 iRichText->InsertL(iRichText->DocumentLength(), buf);
 iTextView->HandleInsertDeleteL
 ( TCursorSelection( iRichText->DocumentLength(), iPromptTextLen ), 0 );
 }
-break;
+return ETrue;
 case EPeninputICFReplace:
 {
 if (iSecretTextTimer->IsActive())
 {
 iSecretTextTimer->Cancel();
 }
 iSecretTextTimer->Start(
 aData.iText.Length()>1?KSecretInstantShowTimer:KSecretUpdateTimer,
 KSecretUpdateTimer, TCallBack(UpdateSecretTextL, this));
 }
-break;
+return ETrue;
 case EPeninputICFSetCurSel:
 default:
 {
 break;
 }
 }
+return EFalse;
 }
 TInt CFepLayoutMultiLineIcfEditor::UpdateSecretTextL(TAny* aEditArea)
 {
 CFepLayoutMultiLineIcfEditor* editArea = static_cast<CFepLayoutMultiLineIcfEditor*>(aEditArea);
 //SetMsgBubbleRect();
 SetMsgBubbleRectAccordingToLanguage();
 }
-void CFepLayoutMultiLineIcfEditor::ResetViewHeightL()
+TBool CFepLayoutMultiLineIcfEditor::ResetViewHeightL()
 {
+const TInt lineCount=iLayout->NumFormattedLines();
+if ( lineCount <= 0 )
+{
+return EFalse;
+}
 const TInt height = iLayout->FormattedHeightInPixels();
-const TInt lineCount=iLayout->NumFormattedLines();
-if ( lineCount <= 0 )
-{
-return;
-}
 TInt lineHeight = (height+lineCount-1) / lineCount;
 if ( iFormatLineHeight == lineHeight )
 {
-return;
+return EFalse;
 }
 if ( lineHeight > iMaxIcfEditorHeight )
 {
 lineHeight = iMaxIcfEditorHeight;
 else
 	{
 	iViewRect.iBr.iY -= margin;
 	}
 iTextView->SetViewRect(iViewRect);
+return ETrue;
 }
 void CFepLayoutMultiLineIcfEditor::SetMsgBubbleRectAccordingToLanguage()
 	{
 	if ( iPreLanguageID == ELangPrcChinese ||
 TBool CFepLayoutMultiLineIcfEditor::IsTextPosValid(TInt aPos)
 {
 return (aPos >= 0 && aPos <= iRichText->DocumentLength());
 }
-void CFepLayoutMultiLineIcfEditor::UpdateNoMatchTextL(TInt aPos, const TDesC& aNoMatchText,
+TBool CFepLayoutMultiLineIcfEditor::UpdateNoMatchTextL(TInt aPos, const TDesC& aNoMatchText,
 TBool aNoMatchState)
 {
 if ( iNoMatchState == aNoMatchState )
 {
-return;
+return EFalse;
 }
 if (aNoMatchState)
 {
 iNoMatchState = aNoMatchState;
 iNoMatchState = aNoMatchState;
 iRichText->DeleteL(aPos, 1);
 iTextView->HandleInsertDeleteL(TCursorSelection(aPos, aPos),1);
 SetSelectionL( TCursorSelection( aPos - 1, aPos - 1 ) );
 }
+return ETrue;
 }
 void CFepLayoutMultiLineIcfEditor::SetPromptTextFormatL(TInt aPromptTextLen)
 {
 if ( aPromptTextLen <= 0 )
 aPreStartPos = aStartPos;
 aPreEndPos = aEndPos;
 }
 }
-void CFepLayoutMultiLineIcfEditor::SetInlineStateL(TBool aInline,
+TBool CFepLayoutMultiLineIcfEditor::SetInlineStateL(TBool aInline,
 TInt aStartPos,
 TInt aEndPos,
 TBool aNoMatchState,
 const TDesC& aNoMatchText)
 {
-if (aInline)
+TInt oldState = iState;
+if ( aInline )
+{
 iState = CFepLayoutMultiLineIcf::EIcfInline;
+}
 else
 {
 iState = CFepLayoutMultiLineIcf::EIcfNormal;
-UpdateNoMatchTextL(iPreInlineEndPos, KNullDesC, EFalse);
+}
-}
+TBool changed = ( oldState != iState );
-SetSpecialStateL(aInline,
-aStartPos,
+if ( changed )
-aEndPos,
+{
-iPreInlineStartPos,
+if ( iState == CFepLayoutMultiLineIcf::EIcfNormal )
-iPreInlineEndPos,
+{
-EAttFontUnderline,
+UpdateNoMatchTextL(iPreInlineEndPos, KNullDesC, EFalse);
-aNoMatchState,
+}
-aNoMatchText);
-}
+SetSpecialStateL(aInline,
+aStartPos,
-void CFepLayoutMultiLineIcfEditor::SetAutoCompleteStateL(TBool aAutoComplete,
+aEndPos,
+iPreInlineStartPos,
+iPreInlineEndPos,
+EAttFontUnderline,
+aNoMatchState,
+aNoMatchText);
+}
+return changed;
+}
+TBool CFepLayoutMultiLineIcfEditor::SetAutoCompleteStateL(TBool aAutoComplete,
 TInt aStartPos,
 TInt aMidPos,
 TInt aEndPos)
 {
+TBool changed = ( iAutoComplete != aAutoComplete );
+// If auto is on, we need draw every time, as grey part is not making the text changed
+// if we use traditional way to check change, auto part is not turn to black when grey part is there.
+changed = iAutoComplete;
 iAutoComplete = aAutoComplete;
 if ( aAutoComplete )
 {
 iState = CFepLayoutMultiLineIcf::EIcfAutoComplete;
 else
 {
 iState = CFepLayoutMultiLineIcf::EIcfNormal;
 }
-SetSpecialStateL(aAutoComplete,
+if ( changed )
-aStartPos,
+{
-aMidPos,
+SetSpecialStateL(aAutoComplete,
-iPreInlineStartPos,
+aStartPos,
-iPreInlineEndPos,
+aMidPos,
-EAttFontUnderline);
+iPreInlineStartPos,
+iPreInlineEndPos,
-SetSpecialStateL(aAutoComplete,
+EAttFontUnderline);
-aMidPos,
-aEndPos,
+SetSpecialStateL(aAutoComplete,
-iPreAutoStartPos,
+aMidPos,
-iPreAutoEndPos,
+aEndPos,
-EAttColor);
+iPreAutoStartPos,
+iPreAutoEndPos,
+EAttColor);
+}
+return changed;
 }
 TAknsItemID CFepLayoutMultiLineIcfEditor::BgImgSkinId() const
 {
 if (iSkinIdSet)
 iFontHeight = 0;
 TRAP_IGNORE(SetFontL(font));
 }
-void CFepLayoutMultiLineIcfEditor::TryDisplayMaxTextL( TInt aCursorPos )
+TBool CFepLayoutMultiLineIcfEditor::TryDisplayMaxTextL( TInt aCursorPos )
 {
+TBool scrolled = EFalse;
 iTextView->FinishBackgroundFormattingL();
 TInt lineIndex = iLayout->GetLineNumber( aCursorPos );
 if ( aCursorPos >= 0 )
 {
 TPoint cursorPt;
 TRAP_IGNORE(iTextView->DocPosToXyPosL(iCursorSel.iCursorPos, cursorPt));
 CalculateCursorPos(cursorPt);
 if ( !iViewRect.Contains( cursorPt ) && ( lineIndex + 1 ) > ( iLineMaxCount - 1 ) )
 {
-iTextView->SetViewLineAtTopL(( lineIndex + 1 ) - ( iLineMaxCount - 1 ));
+if ( iTextView->SetViewLineAtTopL(( lineIndex + 1 ) - ( iLineMaxCount - 1 )) != TPoint( 0, 0 ) )
-RecalcualteTextPositionL();
+{
-//SetMsgBubbleRect();
+scrolled = ETrue;
-SetMsgBubbleRectAccordingToLanguage();
+RecalcualteTextPositionL();
+SetMsgBubbleRectAccordingToLanguage();
+}
 }
 }
 const TInt lineCount = iLayout->NumFormattedLines();
 TPoint ptCursor = iInsertionPoint->Position() ;
 TInt lineCursor = ( ptCursor.iY + iInsertionPoint->Height() / 2
 - iViewRect.iTl.iY) / iFormatLineHeight + 1;
 if( lineCursor < pageCount )
 {
+if ( iTextView->SetViewLineAtTopL(
-iTextView->SetViewLineAtTopL(
+lineCount - pageCount + 1 < 1 ? 1 : lineCount - pageCount + 1 )
-lineCount - pageCount + 1 < 1 ? 1 : lineCount - pageCount + 1 );
+!= TPoint( 0, 0 ) )
+{
-RecalcualteTextPositionL();
+scrolled = ETrue;
-//SetMsgBubbleRect();
+RecalcualteTextPositionL();
 SetMsgBubbleRectAccordingToLanguage();
 }
 }
+}
+return scrolled;
 }
 void CFepLayoutMultiLineIcfEditor::DrawIcfBackground( CFbsBitGc& /*aGc*/, const TRect& aDrawnRect,
 TBool /*aBmpStretchFlag*/ )
 	{
 return;
 }
 iRichText->Extract( aBuf, aPos + iPromptTextLen, aLength);
 }
-void CFepLayoutMultiLineIcfEditor::AdjustSelectionL( const TCursorSelection& aCurSel )
+TBool CFepLayoutMultiLineIcfEditor::AdjustSelectionL( const TCursorSelection& aCurSel )
 {
 if (!IsTextPosValid(aCurSel.LowerPos()) ||
 !IsTextPosValid(aCurSel.HigherPos()) )
 		{
-		return;
+		return EFalse;
 		}
+if (iCursorSel.iAnchorPos == aCurSel.iAnchorPos
+&& iCursorSel.iCursorPos == aCurSel.iCursorPos)
+{
+return EFalse;
+}
 iCursorSel = aCurSel;
 if ( BelongToPromptText(aCurSel.iCursorPos) )
 {
 //why to use iPromptText->Length() instead of iPromptTextLen
 iCursorSel.iAnchorPos = iPromptText->Length();
 }
 iTextView->SetSelectionL( iCursorSel );
 iTextView->SetSelectionVisibilityL( iCursorSelVisible );
+	return ETrue;
 }
 void CFepLayoutMultiLineIcfEditor::ReDrawRect(const TRect& aRect)
 {
 Draw();

branch	RCL_3
changeset 50	5a1685599b76
parent 44	ecbabf52600f
child 56	8152b1f1763a