MCL/sf/app/commonemail: comparison emailuis/emailui/src/ncscomposeviewcontainer.cpp

equal deleted inserted replaced

-:12c456ceeff2
+:5253a20d2a1e
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::NewL()
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CNcsComposeViewContainer* CNcsComposeViewContainer::NewL( CNcsComposeView& aView,
+CNcsComposeViewContainer* CNcsComposeViewContainer::NewL(
-const TRect& aRect, CFSMailBox& aMailBox, CFsAutoSaver& aAutoSaver,
+CNcsComposeView& aView, const TRect& aRect, CFSMailBox& aMailBox,
-TInt aFlags )
+CFsAutoSaver& aAutoSaver, TInt aFlags )
 {
 FUNC_LOG;
 CNcsComposeViewContainer* self = new ( ELeave ) CNcsComposeViewContainer(
 aView, aAutoSaver, aMailBox );
 {
 FUNC_LOG;
 SetMopParent( &iView );
 CreateWindowL();
-	// <cmail>
-// iApplicationRect = aRect;
-	// </cmail>
 // Setup the control array
 InitComponentArrayL();
 CCoeControlArray& controls = Components();
 controls.SetControlsOwnedExternally( ETrue );
 iMessageField->SetAlignment( EAknEditorAlignBidi );
 iMessageField->SetAknEditorInputMode( EAknEditorTextInputMode );
 controls.AppendLC( iMessageField );
 CleanupStack::Pop( iMessageField );
-// <cmail> Platform layout change
 iMessageField->SetNcsFontType( NcsUtility::ENcsBodytextFont );
-// </cmail>
 // Listen edwin events and size events from message body field
 iMessageField->AddEdwinObserverL( this );
 iMessageField->SetEdwinSizeObserver( this );
 iReadOnlyQuoteField->AddEdwinObserverL( this );
 iReadOnlyQuoteField->SetEdwinSizeObserver( this );
 // Create the scroll bar
 iScrollBar = new( ELeave ) CAknDoubleSpanScrollBar( this );
-iScrollBar->ConstructL( this, this, CEikScrollBar::EVertical, aRect.Height() );
+iScrollBar->ConstructL(
+this, this, CEikScrollBar::EVertical, aRect.Height() );
 iScrollBar->MakeVisible( ETrue );
 iScrollBar->SetModelL( &iScrollBarModel );
 iMessageField->SetupEditorL();
 iReadOnlyQuoteField->SetupEditorL();
 SetRect( aRect );
-//<cmail> S60 skin support
 iBgContext = CAknsBasicBackgroundControlContext::NewL(
 KAknsIIDQsnBgAreaMain, Rect(), EFalse );
-// <cmail>
-	//iMessageField->SetSkinBackgroundControlContextL( iBgContext );
-	// </cmail>
 iLongTapDetector = CAknLongTapDetector::NewL( this );
-//</cmail>
 UpdateScrollBarL();
 ActivateL();
 iContactHandler->ClearObservers();
 }
 	delete iHeader;
 delete iScrollBar;
 delete iMessageField;
-// <cmail>
 delete iBgContext;
 	delete iLongTapDetector;
-// </cmail>
 delete iReadOnlyQuoteField;
 delete iReadOnlyQuote;
 delete iPhysics;
 iPhysics = NULL;
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::FocusChanged
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::FocusChanged(TDrawNow aDrawNow)
+void CNcsComposeViewContainer::FocusChanged( TDrawNow aDrawNow )
 {
 FUNC_LOG;
 	if ( iFocused != iHeader &&
 	     iFocused != iMessageField &&
 	     iFocused != iReadOnlyQuoteField )
 {
 		iFocused = iHeader;
 }
 	iFocused->SetFocus( ETrue, aDrawNow );
-	// <cmail>
 	iView.HandleContainerChangeRequiringToolbarRefresh();
-	// </cmail>
 	if ( aDrawNow )
 	    {
 		DrawNow();
 	    }
 {
 FUNC_LOG;
 iHeader->SetMskL();
 }
-//<cmail>
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::HandlePointerEventL()
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::HandlePointerEventL( const TPointerEvent& aPointerEvent )
+void CNcsComposeViewContainer::HandlePointerEventL(
+const TPointerEvent& aPointerEvent )
 {
 	FUNC_LOG;
 CCoeControl::HandlePointerEventL( aPointerEvent );
-if ( iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
+if ( aPointerEvent.iType != TPointerEvent::EButton1Down &&
+iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
 {
 	iLongTapDetector->PointerEventL( aPointerEvent );
 }
 switch( aPointerEvent.iType )
 	{
 	case TPointerEvent::EButton1Down:
 		{
 // Save current and original position so that those can be used in
 // drag/scrolling calculations
-iPreviousPosition = iOriginalPosition = aPointerEvent.iParentPosition;
+iPreviousPosition = iOriginalPosition =
+aPointerEvent.iParentPosition;
 iIsDragging = EFalse;
 iIsFlicking = EFalse;
 if( iPhysics )
 {
 iPhysics->ResetFriction();
 iStartTime.HomeTime();
 UpdatePhysicsL();
 }
+if ( iHeader->Rect().Contains( aPointerEvent.iPosition ) )
-			//Closes the attachment action menu, if it is open.
-			//Otherwise does nothing
-			iView.DismissAttachmentActionMenuL();
-if ( iHeader->Rect().Contains(aPointerEvent.iPosition) )
 {
-if (iFocused == iMessageField)
+if ( iFocused == iMessageField )
 {
 iFocused = iHeader;
 iHeader->SetFocus( ETrue,EDrawNow );
 iMessageField->SetFocus( EFalse, EDrawNow );
 iHeader->MakeVisible( ETrue );
-CommitL(EBodyField);
+CommitL( EBodyField );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
-else if (iFocused == iReadOnlyQuoteField)
+else if ( iFocused == iReadOnlyQuoteField )
 {
 iFocused = iMessageField;
 iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow );
 iHeader->SetFocus( ETrue, EDrawNow );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 }
-else if (iReadOnlyQuoteField->Rect().Contains(aPointerEvent.iPosition))
+else if ( iReadOnlyQuoteField->Rect().Contains(
+aPointerEvent.iPosition ) )
 {
-if (iFocused == iMessageField)
+if ( iFocused == iMessageField )
 {
 iFocused = iReadOnlyQuoteField;
 iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
 iMessageField->SetFocus( EFalse, EDrawNow );
 iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
-else if (iFocused == iHeader)
+else if ( iFocused == iHeader )
 {
 iFocused = iReadOnlyQuoteField;
 iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
 iHeader->SetFocus( EFalse, EDrawNow );
 iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 }
 else
 {
-if (iFocused == iHeader)
+if ( iFocused == iHeader )
 {
 iFocused = iMessageField;
 iHeader->SetFocus( EFalse, EDrawNow );
 iMessageField->SetFocus( ETrue, EDrawNow );
-//iMessageField->SetCursorPosL( iMessageField->TextLength(), EFalse );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
-else if (iFocused == iReadOnlyQuoteField)
+else if ( iFocused == iReadOnlyQuoteField )
 {
 iFocused = iMessageField;
 iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow );
 iMessageField->SetFocus( ETrue, EDrawNow );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 else
 {
-//iMessageField->SetCursorPosL( iMessageField->TextLength(), EFalse );
+const TRect messageFieldRect( iMessageField->Rect() );
-const TRect messageFieldRect(iMessageField->Rect());
+if ( !messageFieldRect.Contains( aPointerEvent.iPosition ) &&
-if (!messageFieldRect.Contains(aPointerEvent.iPosition) &&
+aPointerEvent.iPosition.iY >= messageFieldRect.iTl.iY )
-aPointerEvent.iPosition.iY >= messageFieldRect.iTl.iY )
 {
 iMessageField->OpenVirtualKeyBoardL();
 }
 }
 }
 	case TPointerEvent::EButton1Up:
 		{
 if( iIsDragging && iPhysics )
 {
-TPoint drag(iOriginalPosition - aPointerEvent.iParentPosition);
+TPoint drag( iOriginalPosition - aPointerEvent.iParentPosition );
-iPhysics->StartPhysics(drag, iStartTime);
+iPhysics->StartPhysics( drag, iStartTime );
 iIsFlicking = ETrue;
 iIsDragging = EFalse;
 }
 		break;
 		}
 			TInt areaHeight( Rect().Size().iHeight );
 			TInt scrollOffset( 0 );
 				if( totalHeight > areaHeight )
 					{
-					// Calculate new scroll offset based on current and previous Y-positions
+					// Calculate new scroll offset based on current and
-					scrollOffset = topPosition + ( iPreviousPosition.iY - position.iY );
+					// previous Y-positions
+					scrollOffset = topPosition +
+( iPreviousPosition.iY - position.iY );
 					// Ensure that thumb position is in correct range
 					scrollOffset = Max( scrollOffset, 0 );
-					scrollOffset = Min( scrollOffset, totalHeight - areaHeight );
+					scrollOffset = Min( scrollOffset,
+totalHeight - areaHeight );
 					}
 				ScrollL( scrollOffset );
 				}
 		{
 		// unknown event, ignored
 		break;
 		}
 	}
-}
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
+iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
-//</cmail>
+{
+iLongTapDetector->PointerEventL( aPointerEvent );
+}
+}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::OfferKeyEventL()
 // Handles key events
 // -----------------------------------------------------------------------------
 //
-TKeyResponse CNcsComposeViewContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType )
+TKeyResponse CNcsComposeViewContainer::OfferKeyEventL(
+const TKeyEvent& aKeyEvent, TEventCode aType )
 {
 FUNC_LOG;
 if( iPhysics )
 {
 iPhysics->ResetFriction();
 }
 TKeyResponse ret( EKeyWasNotConsumed );
-//<cmail>
 //we are allowing to change MSK label
-SwitchChangeMskOff(EFalse);
+SwitchChangeMskOff( EFalse );
-//</cmail>
 if ( aKeyEvent.iCode == EKeyYes )
 {
 // check that at least one of the address fields has an address
 if ( !iHeader->AreAddressFieldsEmpty() )
 aType == EEventKey )
 {
 iView.HandleCommandL( ENcsCmdSaveDraft );
 ret = EKeyWasConsumed;
 }
-else if ( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode == EKeyDownArrow )
+else if ( aKeyEvent.iCode == EKeyUpArrow ||
+aKeyEvent.iCode == EKeyDownArrow )
 {
 ret = iFocused->OfferKeyEventL( aKeyEvent, aType );
 if ( ret == EKeyWasNotConsumed )
 {
 // CNcsComposeViewContainer::UpdateScreenPositionL()
 // If the user scrolled down in the message field
 // we want to scroll up the header and grow the message field.
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::UpdateScreenPositionL( const TUint& /*aKeyCode*/ )
+void CNcsComposeViewContainer::UpdateScreenPositionL(
+const TUint& /*aKeyCode*/ )
 {
 FUNC_LOG;
 // get screen rectangle
 const TRect screenRect( Rect() );
 iReadOnlyQuoteField->GetLineRectL( lineRect );
 lineRect.Move( quotePos );
 }
 else
 {
-// This function should be used only when focus is in body or read-only quote
+// This function should be used only when focus is in body or
+// read-only quote
 return;
 }
 TPoint linePos = lineRect.iTl;
 TInt minTargetY = lineRect.Height();
 {
 moveY = minTargetY - linePos.iY;
 }
 // Check we don't scroll too low
-if ( quotePos.iY + moveY + iReadOnlyQuoteField->Size().iHeight < screenRect.Height() )
+if ( quotePos.iY + moveY + iReadOnlyQuoteField->Size().iHeight <
-{
+screenRect.Height() )
-moveY = screenRect.Height() - quotePos.iY - iReadOnlyQuoteField->Size().iHeight;
+{
+moveY = screenRect.Height() - quotePos.iY -
+iReadOnlyQuoteField->Size().iHeight;
 }
 // Check we don't scroll too high
 TPoint headerPos = iHeader->Position();
 if ( headerPos.iY + moveY > 0 )
 quotePos.iY += moveY;
 iReadOnlyQuoteField->SetPosition( quotePos );
 iSeparatorLineYPos += moveY;
 UpdateScrollBarL();
-//DrawDeferred();
 }
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::UpdateFieldPosition
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::UpdateFieldPosition(CCoeControl* aAnchor)
+void CNcsComposeViewContainer::UpdateFieldPosition( CCoeControl* aAnchor )
 {
 FUNC_LOG;
 	// We may not be completely constructed
 	if ( iHeader && iMessageField && iReadOnlyQuoteField )
 	    {
 	    // First, move all the controls in the header
-	    iHeader->UpdateFieldPosition(aAnchor);
+	    iHeader->UpdateFieldPosition( aAnchor );
 	    // Then, move the body field below the header
 	    TRect headerRect = iHeader->Rect();
-		const TSize separatorSize( NcsUtility::SeparatorSizeInThisResolution() );
+		const TSize separatorSize(
+		        NcsUtility::SeparatorSizeInThisResolution() );
 		iSeparatorLineYPos = headerRect.iBr.iY;
 		TPoint bodyPos( iMessageField->Position() );
 		bodyPos.iY = iSeparatorLineYPos + separatorSize.iHeight;
 		iMessageField->SetPosition( bodyPos );
 		TPoint quotePos( iReadOnlyQuoteField->Position() );
 		quotePos.iY = iMessageField->Rect().iBr.iY;
 		iReadOnlyQuoteField->SetPosition( quotePos );
-	    TRAP_IGNORE(UpdateScrollBarL());
+	    TRAP_IGNORE( UpdateScrollBarL() );
 	    DrawDeferred();
 	    }
 }
 // CNcsComposeViewContainer::ChangeFocusL()
 // Handles key events
 // -----------------------------------------------------------------------------
 //
-TKeyResponse CNcsComposeViewContainer::ChangeFocusL( const TKeyEvent& aKeyEvent )
+TKeyResponse CNcsComposeViewContainer::ChangeFocusL(
+const TKeyEvent& aKeyEvent )
 {
 FUNC_LOG;
 TKeyResponse ret( EKeyWasNotConsumed );
 	        {
 iFocused = iHeader;
 		iHeader->SetFocus( ETrue,EDrawNow );
 		iMessageField->SetFocus( EFalse, EDrawNow );
 		iHeader->MakeVisible( ETrue );
-CommitL(EBodyField);
+CommitL( EBodyField );
 ret = EKeyWasConsumed;
 	        }
-	    else if ( aKeyEvent.iCode == EKeyDownArrow && iReadOnlyQuoteField->TextLength() )
+	    else if ( aKeyEvent.iCode == EKeyDownArrow &&
+	              iReadOnlyQuoteField->TextLength() )
 	        {
 	        // Focus move to read-only quote only if there is some text in it.
 	        iFocused = iReadOnlyQuoteField;
 	        iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
 	        iMessageField->SetFocus( EFalse, EDrawNow );
 	    }
 	return EFalse;
 }
-// <cmail> Platform layout changes
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SizeChanged()
 // set size
 // -----------------------------------------------------------------------------
 //
 const TRect rect( Rect() );
 iScrollBar->SetRect( NcsUtility::ListCmailScrollbarRect( rect ) );
 TRect cmailPaneRect( NcsUtility::ListCmailPaneRect( rect ) );
 const TInt headerLineCount( iHeader->LayoutLineCount() );
-const TPoint headerPos( NcsUtility::HeaderControlPosition( cmailPaneRect, 0 ) );
+const TPoint headerPos(
+NcsUtility::HeaderControlPosition( cmailPaneRect, 0 ) );
 cmailPaneRect.Move( 0, iHeader->Position().iY - headerPos.iY );
-NcsUtility::LayoutHeaderControl( iHeader, cmailPaneRect, 0, headerLineCount );
+NcsUtility::LayoutHeaderControl(
+iHeader, cmailPaneRect, 0, headerLineCount );
 // do not used stored headerLineCount, because relayout above may grow or
 // shrink edit fields
+NcsUtility::LayoutBodyEdwin(
+iMessageField, cmailPaneRect, iHeader->LayoutLineCount(),
+iMessageField->LineCount(), iSeparatorLineYPos );
 TRAP_IGNORE( iMessageField->FormatAllTextNowL() );
-NcsUtility::LayoutBodyEdwin( iMessageField, cmailPaneRect, iHeader->LayoutLineCount(), iMessageField->LineCount(),
-iSeparatorLineYPos );
 iMessageField->UpdateFontSize();
 TInt readOnlyQuoteFieldHeight( 0 );
 if ( iReadOnlyQuoteField->TextLength() )
 {
 TInt dummySeparatorPos;
-NcsUtility::LayoutBodyEdwin( iReadOnlyQuoteField, cmailPaneRect, headerLineCount + iMessageField->LineCount(), iReadOnlyQuoteField->LineCount(),
+NcsUtility::LayoutBodyEdwin(
-		dummySeparatorPos );
+iReadOnlyQuoteField, cmailPaneRect,
+iHeader->LayoutLineCount() + iMessageField->LineCount(),
+iReadOnlyQuoteField->LineCount(), dummySeparatorPos );
+TRAP_IGNORE( iReadOnlyQuoteField->FormatAllTextNowL() );
 iReadOnlyQuoteField->UpdateFontSize();
 readOnlyQuoteFieldHeight = iReadOnlyQuoteField->Rect().Height();
 }
 if ( iBgContext )
 iBgContext->SetRect( Rect() );
 }
 iMessageField->SetRealRect( Rect() );
 iReadOnlyQuoteField->SetRealRect( Rect() );
-TInt messageLineHeigth = NcsUtility::HeaderCaptionPaneRect( cmailPaneRect ).Height();
+TInt messageLineHeigth =
-iMessageEditorMinHeigth = cmailPaneRect.Height() - iHeader->Size().iHeight -
+NcsUtility::HeaderCaptionPaneRect( cmailPaneRect ).Height();
-NcsUtility::SeparatorSizeInThisResolution().iHeight -
+iMessageEditorMinHeigth =
-readOnlyQuoteFieldHeight;
+cmailPaneRect.Height() - iHeader->Size().iHeight -
+NcsUtility::SeparatorSizeInThisResolution().iHeight -
+readOnlyQuoteFieldHeight;
 iMessageEditorMinHeigth -= iMessageEditorMinHeigth % messageLineHeigth;
 if ( iMessageEditorMinHeigth > messageLineHeigth )
 {
 TSize newSize( iMessageField->Size().iWidth,
-Max( iMessageField->Size().iHeight, iMessageEditorMinHeigth ));
+Max( iMessageField->Size().iHeight,
+iMessageEditorMinHeigth ) );
 iMessageField->SetSize( newSize );
 }
 else
 {
 iMessageEditorMinHeigth = messageLineHeigth;
 }
-UpdateFieldPosition( NULL );
 TRAP_IGNORE( UpdateScrollBarL() );
 DrawNow();
 }
-// </cmail> Platform layout changes
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::Draw() const
 // Draws the display
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::Draw( const TRect& /*aRect*/ ) const
 {
 FUNC_LOG;
-	// <cmail> S60 skin support
 	if ( iBgContext )
 	    {
 	CWindowGc& gc = SystemGc();
 	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 CPlainText::EOrganiseByParagraph );
 CleanupStack::PopAndDestroy( &inputStream );
 // Activating the field will set the control to the end of the text
 iMessageField->ActivateL();
-iMessageField->SetCursorPosL(0,EFalse);
+iMessageField->SetCursorPosL( 0, EFalse );
 inputStream.Open( aReadOnlyQuote.Ptr(), aReadOnlyQuote.Size() );
 CleanupClosePushL( inputStream );
 iReadOnlyQuoteField->RichText()->ImportTextL( 0, inputStream,
 CPlainText::EOrganiseByParagraph );
 CleanupStack::PopAndDestroy( &inputStream );
 // Activating the field will set the control to the end of the text
 iReadOnlyQuoteField->ActivateL();
-iReadOnlyQuoteField->SetCursorPosL(0,EFalse);
+iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
 // Recalculate the size of the body field
 SizeChanged();
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::HandleScrollEventL()
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::HandleScrollEventL( CEikScrollBar* aScrollBar, TEikScrollEvent /*aEventType*/ )
+void CNcsComposeViewContainer::HandleScrollEventL(
-{
+CEikScrollBar* aScrollBar, TEikScrollEvent /*aEventType*/ )
-// <cmail> Platform layout change
+{
 FUNC_LOG;
 if( iPhysics )
 {
 iPhysics->StopPhysics();
 		RPointerArray<CNcsEmailAddressObject> ncsObjects;
 		CleanupResetAndDestroyClosePushL( ncsObjects );
 		for ( TInt i = 0 ; i < aContacts.Count() ; i++ )
 			{
-			CNcsEmailAddressObject* object = CNcsEmailAddressObject::NewL( aContacts[i]->DisplayName(),
+			CNcsEmailAddressObject* object =
+CNcsEmailAddressObject::NewL( aContacts[i]->DisplayName(),
 					aContacts[i]->EmailAddress() );
 			if ( aContacts[i]->MultipleEmails() )
 				{
 				object->SetDisplayFull( ETrue );
 		CleanupStack::PopAndDestroy( &ncsObjects );
 		}
 	iView.HandleContainerChangeRequiringToolbarRefresh();
 	}
-void CNcsComposeViewContainer::OperationErrorL( TContactHandlerCmd, TInt /*aError*/ )
+// -----------------------------------------------------------------------------
+// CNcsComposeViewContainer::OperationErrorL
+// -----------------------------------------------------------------------------
+//
+void CNcsComposeViewContainer::OperationErrorL(
+TContactHandlerCmd, TInt /*aError*/ )
 	{
 FUNC_LOG;
 	//Nothing to do
 	}
 if ( aEventType == MEikEdwinObserver::EEventTextUpdate ||
 aEventType == MEikEdwinObserver::EEventNavigation )
 {
 iAutoSaver.ReportActivity();
-// Update screen position and scroll bar when text changed or cursor moved
+// Update screen position and scroll bar when text changed
+// or cursor moved
 UpdateScreenPositionL();
 UpdateScrollBarL();
 DrawDeferred();
 }
 }
 iScrollBarModel.SetFocusPosition( visiblePosition );
 iScrollBar->SetModelL( &iScrollBarModel );
 iScrollBar->DrawNow();
 	}
-// -----------------------------------------------------------------------------
-// CNcsComposeViewContainer::SetApplicationRect()
-// -----------------------------------------------------------------------------
-//
-// <cmail>
-/*
-void CNcsComposeViewContainer::SetApplicationRect( TRect aRect )
-	{
-FUNC_LOG;
-	iApplicationRect = aRect;
-	}
-*/
-// </cmail>
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetFocusToMessageFieldL()
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::AddQuickTextL( const TDesC& aText )
 {
 FUNC_LOG;
 // If in 'To' field, go to msg. field
-if(!iMessageField->IsFocused())
+if( !iMessageField->IsFocused() )
 	{
 	SetFocusToMessageFieldL();
 	}
 	TInt pos = iMessageField->CursorPos();
 	TCursorSelection selIns( pos, pos );
 	iMessageField->InsertDeleteCharsL( pos, aText, selIns );
-	//Fix for error EFTG-7Y63XG, moving cursor to the end of inserted text
+	// Fix for error EFTG-7Y63XG, moving cursor to the end of inserted text
 	pos += aText.Length();
-	iMessageField->SetCursorPosL(pos,EFalse);
+	iMessageField->SetCursorPosL( pos, EFalse );
 	DrawDeferred();
 }
 // -----------------------------------------------------------------------------
 	iView.HandleCommandL( EFsEmailUiCmdOpenAttachment );
 	}
 // -----------------------------------------------------------------------------
-// CNcsComposeViewContainer::LaunchAttachmentActionMenuL
+// CNcsComposeViewContainer::LaunchStylusPopupMenu
-// Called when right-click happens in the attahcments field
+// Called when long tap happens in the attachments field
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::LaunchAttachmentActionMenuL()
+void CNcsComposeViewContainer::LaunchStylusPopupMenu( const TPoint& aPenEventScreenLocation )
 {
 FUNC_LOG;
-iView.LaunchAttachmentActionMenuL();
+iView.LaunchStylusPopupMenu( aPenEventScreenLocation );
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::GetToFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-const RPointerArray<CNcsEmailAddressObject>& CNcsComposeViewContainer::GetToFieldAddressesL( TBool aParseNow )
+const RPointerArray<CNcsEmailAddressObject>&
+CNcsComposeViewContainer::GetToFieldAddressesL( TBool aParseNow )
 {
 return iHeader->GetToFieldAddressesL( aParseNow );
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::GetCcFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-const RPointerArray<CNcsEmailAddressObject>& CNcsComposeViewContainer::GetCcFieldAddressesL( TBool aParseNow )
+const RPointerArray<CNcsEmailAddressObject>&
+CNcsComposeViewContainer::GetCcFieldAddressesL( TBool aParseNow )
 {
 return iHeader->GetCcFieldAddressesL( aParseNow );
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::GetBccFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-const RPointerArray<CNcsEmailAddressObject>& CNcsComposeViewContainer::GetBccFieldAddressesL( TBool aParseNow )
+const RPointerArray<CNcsEmailAddressObject>&
+CNcsComposeViewContainer::GetBccFieldAddressesL( TBool aParseNow )
 {
 return iHeader->GetBccFieldAddressesL( aParseNow );
 }
 // -----------------------------------------------------------------------------
 {
 FUNC_LOG;
 return iHeader->IsCcFieldVisible();
 }
-// <cmail> Removed unneeded IsFocusAif
-// </cmail>
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::IsFocusAttachments
 //
 // -----------------------------------------------------------------------------
 void CNcsComposeViewContainer::SetMenuBar( CEikButtonGroupContainer* aMenuBar )
 {
 FUNC_LOG;
 	iHeader->SetMenuBar(aMenuBar);
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetToFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::SetToFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress )
+void CNcsComposeViewContainer::SetToFieldAddressesL(
+RPointerArray<CNcsEmailAddressObject>& aAddress )
 {
 FUNC_LOG;
 iHeader->SetToFieldAddressesL(aAddress);
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetCcFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::SetCcFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress )
+void CNcsComposeViewContainer::SetCcFieldAddressesL(
+RPointerArray<CNcsEmailAddressObject>& aAddress )
 {
 FUNC_LOG;
 iHeader->SetCcFieldAddressesL( aAddress );
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetBccFieldAddressesL
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::SetBccFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress )
+void CNcsComposeViewContainer::SetBccFieldAddressesL(
+RPointerArray<CNcsEmailAddressObject>& aAddress )
 {
 FUNC_LOG;
 iHeader->SetBccFieldAddressesL( aAddress );
 iHeader->SetSubjectL( aSubject );
 }
 // -----------------------------------------------------------------------------
-// CNcsComposeViewContainer::SetAttachmentLabelTextL
+// CNcsComposeViewContainer::SetAttachmentLabelTextsLD
 //
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::SetAttachmentLabelTextL( const TDesC& aText )
+void CNcsComposeViewContainer::SetAttachmentLabelTextsLD(
-{
+CDesCArray* aAttachmentNames, CDesCArray* aAttachmentSizes )
-FUNC_LOG;
+{
+FUNC_LOG;
-	iHeader->SetAttachmentLabelTextL( aText );
+iHeader->SetAttachmentLabelTextsLD( aAttachmentNames, aAttachmentSizes );
+}
-}
+// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+// CNcsComposeViewContainer::FocusedAttachmentLabelIndex
-// CNcsComposeViewContainer::SetAttachmentLabelTextL
+//
-//
+// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+//
-//
+TInt CNcsComposeViewContainer::FocusedAttachmentLabelIndex()
-void CNcsComposeViewContainer::SetAttachmentLabelTextL( const TDesC& aAttachmentName,
+{
-const TDesC& aAttachmentSizeDesc )
+FUNC_LOG;
-{
+return iHeader->FocusedAttachmentLabelIndex();
-FUNC_LOG;
-iHeader->SetAttachmentLabelTextL( aAttachmentName, aAttachmentSizeDesc );
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::HideAttachmentLabel
 //
 		iFocused = iHeader;
 		iHeader->SetFocus( ETrue, EDrawNow );
 		iMessageField->SetFocus( EFalse, EDrawNow );
 		iHeader->MakeVisible( ETrue );
 	}
 	iHeader->FocusAttachmentField();
 	}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::AreAddressFieldsEmpty
 //
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::HandleLayoutChangeL()
 {
 FUNC_LOG;
-TRect rect = iView.ClientRect();
+SetRect( iView.ClientRect() );
-SetRect( rect );
 if ( iHeader )
 {
 iHeader->HandleDynamicVariantSwitchL();
 }
 UpdateScrollBarL();
 if ( iHeader )
 {
 iHeader->HandleDynamicVariantSwitchL();
 }
-// <cmail>
 if ( iMessageField )
 {
 iMessageField->UpdateFontSize();
 }
 if ( iScrollBar )
 {
 iScrollBar->HandleResourceChange( KAknsMessageSkinChange );
 iScrollBar->DrawNow();
 }
-// </cmail>
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::ContentTotalHeight
 // Return the total height of the components shown in the view
 {
 FUNC_LOG;
 const TSize separatorSize( NcsUtility::SeparatorSizeInThisResolution() );
 	TInt totalHeight( iHeader->Size().iHeight +
-					  separatorSize.iHeight*2 + iMessageField->Size().iHeight );
+					  separatorSize.iHeight*2 +
+					  iMessageField->Size().iHeight );
 	if( iReadOnlyQuoteField->IsVisible() )
 		{
 		totalHeight += iReadOnlyQuoteField->Size().iHeight;
 		}
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::CommitL( TFieldToCommit aFieldToCommit )
 {
 FUNC_LOG;
-iView.CommitL(ETrue,aFieldToCommit);
+iView.CommitL( ETrue, aFieldToCommit );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
-//<cmail>
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SwitchChangeMskOff
-//sets up iSwitchChangeMskOff falg, which disables changes of MSK label if any popup dialog is open
+// sets up iSwitchChangeMskOff falg, which disables changes of MSK label if
+// any popup dialog is open
 // -----------------------------------------------------------------------------
 void CNcsComposeViewContainer::SwitchChangeMskOff(TBool aTag)
 {
 FUNC_LOG;
-iHeader->SwitchChangeMskOff(aTag);
+iHeader->SwitchChangeMskOff( aTag );
 }
-//</cmail>
-//<cmail>
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::HandleLongTapEventL()
 // Handles key events
 // -----------------------------------------------------------------------------
-void CNcsComposeViewContainer::HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& /*aPenEventScreenLocation*/ )
+void CNcsComposeViewContainer::HandleLongTapEventL(
-{
+const TPoint& aPenEventLocation,
-FUNC_LOG;
+const TPoint& aPenEventScreenLocation )
-iHeader->HandleLongTapL( aPenEventLocation );
+{
-}
+FUNC_LOG;
-//</cmail>
+iHeader->HandleLongTap( aPenEventLocation, aPenEventScreenLocation );
+}
-//<cmail>
 void CNcsComposeViewContainer::FixSemicolonL()
 	{
 FUNC_LOG;
 	iHeader->FixSemicolonInAddressFieldsL();
 	}
-//</cmail>
 // ---------------------------------------------------------------------------
 // CNcsComposeViewContainer::UpdatePhysicsL()
 // ---------------------------------------------------------------------------
 //
 if ( iPhysics )
 {
 const TSize viewSize( Rect().Size() );
 // We must ensure that world size is at least the size of the view
 const TSize worldSize( viewSize.iWidth,
-Max(ContentTotalHeight(), viewSize.iHeight) );
+Max( ContentTotalHeight(), viewSize.iHeight ) );
 iPhysics->InitPhysicsL( worldSize, viewSize, EFalse );
 }
 }
 // -----------------------------------------------------------------------------
 void CNcsComposeViewContainer::ScrollL( TInt aTargetPos )
 	{
 FUNC_LOG;
 	TPoint headerPos( iHeader->Position() );
-	aTargetPos = Max( 0, Min(aTargetPos, ContentTotalHeight() - Rect().Height()) );
+	aTargetPos = Max( 0, Min( aTargetPos,
+	                          ContentTotalHeight() - Rect().Height()) );
 	TInt moveY = -headerPos.iY - aTargetPos;
 	if( moveY )
 		{
 		UpdateScrollBarL();
 		DrawNow();
 		}
 	}
-/**
+// -----------------------------------------------------------------------------
-* @see MAknPhysicsObserver::ViewPositionChanged
+// CNcsComposeViewContainer::ViewPositionChanged
-*/
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
 void CNcsComposeViewContainer::ViewPositionChanged(
 const TPoint& aNewPosition,
 TBool /*aDrawNow*/,
 TUint /*aFlags*/ )
 {
 		TRAP_IGNORE( ScrollL( scrollOffset ) );
 		}
 	}
-/**
+// -----------------------------------------------------------------------------
-* @see MAknPhysicsObserver::PhysicEmulationEnded
+// CNcsComposeViewContainer::PhysicEmulationEnded
-*/
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
 void CNcsComposeViewContainer::PhysicEmulationEnded()
 {
 FUNC_LOG;
 iIsFlicking = EFalse;
 }
-/**
+// -----------------------------------------------------------------------------
-* @see MAknPhysicsObserver::ViewPosition
+// CNcsComposeViewContainer::ViewPosition
-*/
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
 TPoint CNcsComposeViewContainer::ViewPosition() const
 {
 FUNC_LOG;
 return TPoint(0, -iHeader->Position().iY + Rect().Size().iHeight / 2 );
 }
+// -----------------------------------------------------------------------------
+// CNcsComposeViewContainer::IsRemoteSearchInprogress
+// -----------------------------------------------------------------------------
+//
 TBool CNcsComposeViewContainer::IsRemoteSearchInprogress() const
 {
 FUNC_LOG;
 return iHeader->IsRemoteSearchInprogress();
 }

changeset 2	5253a20d2a1e
parent 1	12c456ceeff2
child 3	a4d6f1ea0416