FCL/sf/app/commonemail: comparison emailuis/emailui/src/ncsheadercontainer.cpp

equal deleted inserted replaced

-:968773a0b6ef
+:c8382f7b54ef
 #include <StringLoader.h>
 #include <aknViewAppUi.h>
 #include <aknnotewrappers.h> //CAknInformationNote
 #include <FreestyleEmailUi.rsg>
 #include <aknphysics.h>
+#include <AknPriv.hrh>
 #include "cfsmailbox.h"
 #include <FreestyleEmailUi.rsg>
+#include <layoutmetadata.cdl.h>
 #include "FSEmailBuildFlags.h"
 #include "ncsheadercontainer.h"
 #include "ncscomposeviewcontainer.h"
 #include "ncsemailaddressobject.h"
 	CAknPhysics* aPhysics ):
 	iParent( aParent ),
 	iFieldSizeObserver( static_cast< CNcsComposeViewContainer& >( aParent ) ),
 	iMailBox( aMailBox ),
 	iLongTapEventConsumed( EFalse ),
-iPhysics( aPhysics )
+iPhysics( aPhysics ),
+iSplitScreenVKBEnabled( EFalse )
 	{
 FUNC_LOG;
 	}
 // ---------------------------------------------------------------------------
 {
 controls.Remove( iBccField );
 }
 // initially attachments field is hidden
-	iAttachmentField->MakeVisible( EFalse );
+iAttachmentField->MakeVisible( EFalse );
-	controls.Remove( iAttachmentField );
+controls.Remove( iAttachmentField );
-	// test whether mailbox supports remote lookup
+// test whether mailbox supports remote lookup
-	TBool remoteLookupSupported =
+TBool remoteLookupSupported =
 TFsEmailUiUtility::IsRemoteLookupSupported( iMailBox );
-	iAacListBox = CNcsPopupListBox::NewL(
+iAacListBox = CNcsPopupListBox::NewL(
-	        this, iMailBox, *this, remoteLookupSupported );
+this, iMailBox, *this, remoteLookupSupported );
-	iAacListBox->MakeVisible( EFalse );
 iRALInProgress = EFalse;
 iToField->EnableKineticScrollingL( iPhysics );
 iCcField->EnableKineticScrollingL( iPhysics );
 	delete iAacListBox;
 	delete iLongTapDetector;
 	}
 // ---------------------------------------------------------------------------
+// From MNcsPopupListBoxObserver.
+// ---------------------------------------------------------------------------
+//
+TBool CNcsHeaderContainer::PopupVisibilityChangingL( TBool aVisible )
+{
+CNcsComposeViewContainer& parent =
+static_cast<CNcsComposeViewContainer&>( iParent );
+if ( aVisible )
+{
+DoScrollFocusToTop();
+iAacListBox->SetPopupMaxRect( CalculatePopupRect() );
+}
+else
+{
+// Scroll editor top, if it can be fully displayed.
+if ( parent.ContentTotalHeight() < parent.VisibleAreaHeight() )
+{
+parent.Scroll( 0, ETrue );
+}
+}
+parent.UpdateScrollBarVisibility( !aVisible );
+ShowPopupMenuBarL( aVisible );
+return ETrue;
+}
+// ---------------------------------------------------------------------------
+// From MNcsPopupListBoxObserver.
+// ---------------------------------------------------------------------------
+//
+void CNcsHeaderContainer::PopupItemSelectedL()
+{
+DoPopupSelectL();
+}
+// ---------------------------------------------------------------------------
 // CNcsHeaderContainer::FocusChanged
 // ---------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::FocusChanged( TDrawNow aDrawNow )
-	{
+{
 FUNC_LOG;
 CCoeControl* focused = iFocused;
 if ( !focused )
 {
 focused = FindFocused();
 iFocused = focused;
 }
 if ( !IsFocused() )
 {
 if ( focused )
 {
 // We're loosing focus (probably going to message body)
 // Commit changes and make sure no controls are focused.
-TRAP_IGNORE( CommitFieldL( focused ) );
+if ( iParent.IsFocused() )
+{
+TRAP_IGNORE( CommitFieldL( focused ) );
+}
 focused->SetFocus( EFalse, aDrawNow );
-iFocused = NULL;
 }
 // Remove MSK label when header loses focus
 TRAP_IGNORE( SetMskL() );
-		}
+}
-	else if ( IsFocused() && !focused )
+else
-		{
+{
-		// We're gaining focus from the message body
+if ( !focused )
-		// Set the focus to the last control in the control array
+{
-		// (either attachment line or subject field)
+// We're gaining focus from the message body
-		CCoeControlArray::TCursor cur = Components().End();
+// Set the focus to the last control in the control array
-		cur.Prev();
+// (either attachment line or subject field)
-		cur.Control<CCoeControl>()->SetFocus( ETrue, aDrawNow );
+CCoeControlArray::TCursor cur = Components().End();
-iFocused = cur.Control<CCoeControl>();
+cur.Prev();
-		}
+iFocused = cur.Control<CCoeControl>();
-	}
+}
+iFocused->SetFocus( ETrue, aDrawNow );
-// ---------------------------------------------------------------------------
-// CNcsHeaderContainer::ShowCursor
-// ---------------------------------------------------------------------------
-//
-void CNcsHeaderContainer::ShowCursor( TBool aShow, TDrawNow aDrawNow )
-{
-CCoeControl* focused = FindFocused();
-if ( focused )
-{
-iFocused = focused;
-}
-if ( iFocused )
-{
-iFocused->SetFocus( aShow, aDrawNow );
 }
 }
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::Draw() const
 //
 // -----------------------------------------------------------------------------
 void CNcsHeaderContainer::HandlePointerEventL(
 const TPointerEvent& aPointerEvent )
 {
-	FUNC_LOG;
+FUNC_LOG;
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
+{
+CCoeControl* component = 0;
+for ( TInt i=0; i < Components().Count(); ++i )
+{
+TRect rc = Components().At( i ).iControl->Rect();
+if ( rc.Contains( aPointerEvent.iPosition ) )
+{
+component = Components().At( i ).iControl;
+}
+}
+if ( component )
+{
+CCoeControl* pOldCtrl = FindFocused();
+CCoeControl* pNewCtrl= component;
+if ( pOldCtrl != pNewCtrl )
+{
+// Unfocus the control
+if ( pOldCtrl )
+{
+pOldCtrl->SetFocus( EFalse, ENoDrawNow );
+}
+pNewCtrl->SetFocus( ETrue, ENoDrawNow );
+iFocused = pNewCtrl;
+// Commit changes to previously focused field.
+if ( pOldCtrl )
+{
+CommitFieldL( pOldCtrl );
+}
+// If the attachments label has changed focus
+if ( pOldCtrl == iAttachmentField ||
+pNewCtrl == iAttachmentField )
+{
+DrawAttachmentFocusNow();
+}
+CNcsComposeViewContainer* container =
+static_cast<CNcsComposeViewContainer*>( &iParent );
+container->UpdateScrollBar();
+}
+DrawDeferred();
+}
+}
 if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
-		CCoeControl* clicked = 0;
+if ( iLongTapEventConsumed )
-		for ( TInt i=0; i < Components().Count(); ++i )
+{
-			{
+iLongTapEventConsumed = EFalse;
-			TRect rc = Components().At( i ).iControl->Rect();
+return;
-			if ( rc.Contains( aPointerEvent.iPosition ) )
+}
-				{
-				clicked = Components().At( i ).iControl;
+CCoeControl* component = 0;
-				}
+for ( TInt i=0; i < Components().Count(); ++i )
-			}
+{
+TRect rc = Components().At( i ).iControl->Rect();
-	    if ( clicked )
+if ( rc.Contains( aPointerEvent.iPosition ) )
-	        {
+{
-			CCoeControl* pOldCtrl = FindFocused();
+component = Components().At( i ).iControl;
-			CCoeControl* pNewCtrl= clicked;
+}
+}
-			if ( pOldCtrl != pNewCtrl )
-				{
+if ( component && component == iFocused )
-				// Unfocus the control
+{
-				if ( pOldCtrl )
+TBool physicsActionOngoing( EFalse );
-					{
+if ( iPhysics && iPhysics->OngoingPhysicsAction() != CAknPhysics::EAknPhysicsActionNone )
-					pOldCtrl->SetFocus( EFalse, ENoDrawNow );
+{
-					}
-				pNewCtrl->SetFocus( ETrue, ENoDrawNow );
-				iFocused = pNewCtrl;
-				// Commit changes to previously focused field.
-				if ( pOldCtrl )
-					{
-					CommitFieldL( pOldCtrl );
-					}
-				// If the attachments label has changed focus
-				if ( pOldCtrl == iAttachmentField ||
-					 pNewCtrl == iAttachmentField )
-					{
-					DrawAttachmentFocusNow();
-					}
-				CNcsComposeViewContainer* container =
-					static_cast<CNcsComposeViewContainer*>( &iParent );
-				container->UpdateScrollBar();
-				}
-			if( iLongTapEventConsumed )
-				{
-				iLongTapEventConsumed = EFalse;
-				return;
-				}
-			TBool physicsActionOngoing( EFalse );
-			if ( iPhysics && iPhysics->OngoingPhysicsAction() != CAknPhysics::EAknPhysicsActionNone )
-			{
 physicsActionOngoing = ETrue;
 }
-			if( pNewCtrl == iAttachmentField && !physicsActionOngoing )
+if ( component == iAttachmentField && !physicsActionOngoing )
-				{
+{
-				CNcsComposeViewContainer& parent =
+CNcsComposeViewContainer& parent =
-					static_cast<CNcsComposeViewContainer&>( iParent );
+static_cast<CNcsComposeViewContainer&>( iParent );
-				parent.HandleAttachmentsOpenCommandL();
+parent.HandleAttachmentsOpenCommandL();
-				}
+}
-	        }
+}
 }
-	CCoeControl::HandlePointerEventL( aPointerEvent );
+CCoeControl::HandlePointerEventL( aPointerEvent );
 }
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::HandleLongTapL()
 //
 {
 FUNC_LOG;
 TKeyResponse ret( EKeyWasNotConsumed );
 TBool doScroll( EFalse );
-if( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode == EKeyDownArrow )
+if ( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode == EKeyDownArrow )
-	{
+{
 if ( iAacListBox && iAacListBox->IsVisible() &&
 !iAacListBox->IsPopupEmpty() )
-	{
+{
-	return iAacListBox->OfferKeyEventL( aKeyEvent, aType );
+return iAacListBox->OfferKeyEventL( aKeyEvent, aType );
-	}
+}
 else
-	        {
+{
-		    ret = FindFocused()->OfferKeyEventL( aKeyEvent, aType );
+ret = FindFocused()->OfferKeyEventL( aKeyEvent, aType );
+doScroll = ( ret == EKeyWasConsumed );
-		doScroll = ( ret == EKeyWasConsumed );
+}
-	        }
 if ( ret == EKeyWasNotConsumed )
-	{
+{
 ret = ChangeFocusL( aKeyEvent );
-	DrawDeferred();
+DrawDeferred();
-	}
+}
-	}
+}
 else
 	{
 if ( FindFocused() == iAttachmentField )
 	{
 	if ( aType == EEventKey )
 		         ( aKeyEvent.iCode == EKeyEnter ||
 		           aKeyEvent.iScanCode == EStdKeyEnter) )
 		        {
 		        FindFocused()->OfferKeyEventL( aKeyEvent, aType );
 		        ret = EKeyWasConsumed;
+		        doScroll = ETrue;
 		        }
 		    }
 	}
 if ( ret == EKeyWasNotConsumed )
 	{
 	CCoeControl* focused = FindFocused();
 	if ( focused )
 		{
 		ret = focused->OfferKeyEventL( aKeyEvent, aType );
-		if(aType==EEventKeyDown)
+		if( aType == EEventKeyDown &&
+		    aKeyEvent.iScanCode != EStdKeyUpArrow &&
+		    aKeyEvent.iScanCode != EStdKeyDownArrow )
 		    {
 		    doScroll = ETrue;
 		    }
 		else
 		    {
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::FindFocused
 // ---------------------------------------------------------------------------
 //
 CCoeControl* CNcsHeaderContainer::FindFocused() const
-	{
+{
 FUNC_LOG;
-	CCoeControlArray::TCursor cur = Components().Begin();
+CCoeControlArray::TCursor cur = Components().Begin();
-	do
+do
-		{
+{
-		if ( cur.Control<CCoeControl>()->IsFocused() )
+if ( cur.Control<CCoeControl>()->IsFocused() )
-			{
+{
-			return cur.Control<CCoeControl>();
+return cur.Control<CCoeControl>();
-			}
+}
-		}
+}
-	while ( cur.Next() );
+while ( cur.Next() );
-	return NULL;
+return NULL;
-	}
+}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::ChangeFocusL()
 // Handles key events
 // -----------------------------------------------------------------------------
 TKeyResponse CNcsHeaderContainer::ChangeFocusL( const TKeyEvent& aKeyEvent )
-	{
+{
 FUNC_LOG;
-	ASSERT( aKeyEvent.iCode == EKeyDownArrow ||
+ASSERT( aKeyEvent.iCode == EKeyDownArrow ||
-	        aKeyEvent.iCode == EKeyUpArrow );
+aKeyEvent.iCode == EKeyUpArrow );
 TKeyResponse ret( EKeyWasNotConsumed );
 CCoeControl* pOldCtrl = FindFocused();
 // If nothing is focused we return
 if ( !pOldCtrl ) return ret;
 //If this is the first control in the list, don't change focus
 CCoeControlArray::TCursor cur = Components().Find(pOldCtrl);
 if ( aKeyEvent.iCode == EKeyUpArrow && cur == Components().Begin() )
-	{
+{
-	return ret;
+return ret;
-	}
+}
 // Unfocus the control
-	pOldCtrl->SetFocus( EFalse, ENoDrawNow );
+pOldCtrl->SetFocus( EFalse, ENoDrawNow );
-	CCoeControl* pNewCtrl= NULL;
+CCoeControl* pNewCtrl= NULL;
-if ( aKeyEvent.iCode == EKeyDownArrow && cur.Next() )
+if ( ( aKeyEvent.iCode == EKeyDownArrow && cur.Next() ) ||
-	{
+( aKeyEvent.iCode == EKeyUpArrow && cur.Prev() ) )
-	    pNewCtrl = cur.Control<CCoeControl>();
+{
-		pNewCtrl->SetFocus( ETrue, ENoDrawNow );
+pNewCtrl = cur.Control<CCoeControl>();
+iFocused = pNewCtrl;
+pNewCtrl->SetFocus( ETrue, ENoDrawNow );
 ret = EKeyWasConsumed;
-	}
+}
-else if ( aKeyEvent.iCode == EKeyUpArrow && cur.Prev() )
-	{
+CNcsComposeViewContainer* container =
-	    pNewCtrl = cur.Control<CCoeControl>();
-		pNewCtrl->SetFocus( ETrue, ENoDrawNow );
-ret = EKeyWasConsumed;
-	}
-CNcsComposeViewContainer* container =
 static_cast<CNcsComposeViewContainer*>( &iParent );
 if ( pOldCtrl == iToField )
 {
 container->CommitL( EToField );
 }
 }
 else if ( pOldCtrl == iSubjectField)
 {
 container->CommitL( ESubjectField );
 }
-	// If the attachments label has changed focus
+// If the attachments label has changed focus
-	if ( pOldCtrl == iAttachmentField || pNewCtrl == iAttachmentField )
+if ( pOldCtrl == iAttachmentField || pNewCtrl == iAttachmentField )
-		{
+{
-		DrawAttachmentFocusNow();
+DrawAttachmentFocusNow();
-		}
+}
 // if focus was changed, update scroll bar
 if ( ret == EKeyWasConsumed )
 {
 container->UpdateScrollBar();
 DoScroll();
 }
-	// NOTE: If we're leaving the header (down was pushed on last control)
+// NOTE: If we're leaving the header (down was pushed on last control)
-	//       then we return EKeyWasNotConsumed to make sure the
+//       then we return EKeyWasNotConsumed to make sure the
-	//		 parent moves the focus to the control below this container
+//		 parent moves the focus to the control below this container
 return ret;
 	}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::UpdateFieldPosition()
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::SizeChanged()
 // set size
 // -----------------------------------------------------------------------------
 void CNcsHeaderContainer::SizeChanged()
-	{
+{
 FUNC_LOG;
 const TRect rect( Rect() );
 TInt currentLine( 0 );
 CCoeControlArray::TCursor cur = Components().Begin();
 do
 // during layout (e.g. when orientation is changed => edit field
 // length may change => it grows or shrinks)
 currentLine += ToNcsControl( cur )->LayoutLineCount();
 }
 } while ( cur.Next() );
-	if( iAacListBox->IsVisible() && !iAacListBox->IsPopupEmpty() )
+if ( iAacListBox->IsVisible() && !iAacListBox->IsPopupEmpty() )
-		{
+{
-		iAacListBox->SetPopupMaxRect( CalculatePopupRect() );
+iAacListBox->SetPopupMaxRect( CalculatePopupRect() );
-		}
+}
 	}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::PositionChanged()
 // set size
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::GetToLineHeight
 // ---------------------------------------------------------------------------
 //
 TInt CNcsHeaderContainer::GetToLineHeight() const
-	{
+{
-	FUNC_LOG;
+FUNC_LOG;
-	TInt lineHeight = 0;
+TInt lineHeight = 0;
-	if(iToField)
+if ( iToField )
-		{
+{
-	    TRect lineRect;
+TRect lineRect;
-	    TRAPD(err, iToField->GetLineRectL(lineRect) );
+iToField->GetLineRect( lineRect );
-	   	if(err == KErrNone)
+lineHeight = lineRect.Height();
-	        {
+}
-	        lineHeight = lineRect.iBr.iY - lineRect.iTl.iY;
+return lineHeight;
-	        }
+}
-		}
-	return lineHeight;
-	}
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::GetTotalHeight
 // ---------------------------------------------------------------------------
 //
 TInt CNcsHeaderContainer::GetTotalHeight() const
 if ( pOldCtrl )
 {
 pOldCtrl->SetFocus( EFalse, ENoDrawNow );
 }
+iFocused = iAttachmentField;
 iAttachmentField->SetFocus( ETrue, ENoDrawNow );
 iFieldSizeObserver.UpdateFieldPosition( iAttachmentField );
 }
 }
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::HideAttachmentLabel()
 // -----------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::HideAttachmentLabel()
-	{
+{
 FUNC_LOG;
-	// check if we are focused and in that case
+// check if we are focused and in that case
-	// unfocus attachment filed and focus previous control
+// unfocus attachment filed and focus previous control
 CCoeControl* pOldCtrl = FindFocused();
 CCoeControl* pNewCtrl = NULL;
 if ( pOldCtrl == iAttachmentField )
 {
 CCoeControlArray::TCursor cur = Components().Find( pOldCtrl );
-	    pOldCtrl->SetFocus( EFalse, ENoDrawNow );
+pOldCtrl->SetFocus( EFalse, ENoDrawNow );
-	    if ( cur.Prev() )
+if ( cur.Prev() )
-	        {
+{
-	        pNewCtrl = cur.Control<CCoeControl>();
+pNewCtrl = cur.Control<CCoeControl>();
-		    pNewCtrl->SetFocus( ETrue, ENoDrawNow );
+iFocused = pNewCtrl;
-	        }
+pNewCtrl->SetFocus( ETrue, ENoDrawNow );
+}
 }
 else
 {
 pNewCtrl = pOldCtrl; // no need to move focus
 }
-	if ( pOldCtrl == iAttachmentField || pNewCtrl == iAttachmentField )
+if ( pOldCtrl == iAttachmentField || pNewCtrl == iAttachmentField )
-		{
+{
-		DrawAttachmentFocusNow();
+DrawAttachmentFocusNow();
-		}
+}
-	iAttachmentField->MakeVisible( EFalse );
+iAttachmentField->MakeVisible( EFalse );
-	Components().Remove( iAttachmentField );
+Components().Remove( iAttachmentField );
+TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
-	TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
 // Scroll to currently focused field
-	if ( pNewCtrl )
+if ( pNewCtrl )
-	    {
+{
-	    iFieldSizeObserver.UpdateFieldPosition( pNewCtrl );
+iFieldSizeObserver.UpdateFieldPosition( pNewCtrl );
-	    }
+}
-	}
+}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::SetBccFieldVisibleL()
 // -----------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::SetBccFieldVisibleL(
 TBool aVisible, TDrawNow aDrawNow, TBool aFocus )
 {
 FUNC_LOG;
-	if ( iBccField->IsVisible() == aVisible )
+if ( iBccField->IsVisible() == aVisible )
-		{
+{
-		return;
+return;
-		}
+}
-	if ( aVisible )
+if ( aVisible )
-		{
+{
-		CCoeControlArray::TCursor cur = Components().Find( iSubjectField );
+CCoeControlArray::TCursor cur = Components().Find( iSubjectField );
-		Components().InsertLC( cur, iBccField );
+Components().InsertLC( cur, iBccField );
-		CleanupStack::Pop( iBccField );
+CleanupStack::Pop( iBccField );
-		if ( aFocus )
+if ( aFocus )
-			{
+{
-			CCoeControl* focused = FindFocused();
+CCoeControl* focused = FindFocused();
-			if ( focused )
+if ( focused )
-				{
+{
-				focused->SetFocus( EFalse );
+focused->SetFocus( EFalse, aDrawNow );
-				}
+}
-			iBccField->SetFocus( ETrue );
+iBccField->SetFocus( ETrue, aDrawNow );
 iFocused = iBccField;
-			iBccField->SelectAllTextL();
+iBccField->SelectAllTextL();
-			}
+}
-		}
+}
-	else
+else
-		{
+{
-		if ( iBccField->IsFocused() )
+if ( iBccField->IsFocused() )
-			{
+{
-			CCoeControlArray::TCursor cur = Components().Find( iBccField );
+CCoeControlArray::TCursor cur = Components().Find( iBccField );
-			ASSERT( cur.IsValid() );
+ASSERT( cur.IsValid() );
-			iBccField->SetFocus( EFalse );
+iBccField->SetFocus( EFalse );
-			cur.Prev(); // Get the control before this field
+cur.Prev(); // Get the control before this field
-			cur.Control<CCoeControl>()->SetFocus( ETrue );
+CCoeControl* focused = cur.Control<CCoeControl>();
-			}
+focused->SetFocus( ETrue );
-		Components().Remove( iBccField );
+iFocused = focused;
-iFocused = iSubjectField;
+}
-		}
+Components().Remove( iBccField );
+}
 TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
-	if ( aDrawNow == EDrawNow )
+if ( aDrawNow == EDrawNow )
-		{
+{
-	    DrawDeferred();
+DrawDeferred();
-		}
+}
-	}
+}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::SetCcFieldVisibleL()
 // -----------------------------------------------------------------------------
 void CNcsHeaderContainer::SetCcFieldVisibleL(
 TBool aVisible, TDrawNow aDrawNow, TBool aFocus )
-	{
+{
 FUNC_LOG;
-	if ( iCcField->IsVisible() == aVisible )
+if ( iCcField->IsVisible() == aVisible )
-		{
+{
-		return;
+return;
-		}
+}
-	if ( aVisible )
+if ( aVisible )
-		{
+{
-		Components().InsertAfterLC( Components().Id( *iToField ), iCcField );
+Components().InsertAfterLC( Components().Id( *iToField ), iCcField );
-		CleanupStack::Pop( iCcField );
+CleanupStack::Pop( iCcField );
-		if ( aFocus )
+if ( aFocus )
-			{
+{
-			CCoeControl* focused = FindFocused();
+CCoeControl* focused = FindFocused();
-			if ( focused )
+if ( focused )
-				{
+{
-				focused->SetFocus( EFalse );
+focused->SetFocus( EFalse, aDrawNow );
-				}
+}
-			iCcField->SetFocus( ETrue );
+iCcField->SetFocus( ETrue, aDrawNow );
 iFocused = iCcField;
-			iCcField->SelectAllTextL();
+iCcField->SelectAllTextL();
-			}
+}
-		}
+}
-	else
+else
-		{
+{
-		if( iCcField->IsFocused() )
+if( iCcField->IsFocused() )
-			{
+{
-			iCcField->SetFocus( EFalse );
+iCcField->SetFocus( EFalse );
-			iToField->SetFocus( ETrue );
+iToField->SetFocus( ETrue );
-			}
+iFocused = iToField;
-		Components().Remove( iCcField );
+}
-iFocused = iToField;
+Components().Remove( iCcField );
-		}
+}
-	TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
+TRAP_IGNORE( iFieldSizeObserver.UpdateFieldSizeL() );
 if ( aDrawNow == EDrawNow )
-		{
+{
-	    DrawDeferred();
+DrawDeferred();
-		}
+}
 }
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::MopSupplyObject
 // From CCoeControl.
 // CNcsHeaderContainer::UpdatePopupContactListL()
 // -----------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::UpdatePopupContactListL(
 const TDesC& aMatchString, TBool /*aListAll*/ )
-	{
+{
 FUNC_LOG;
 // do update only for address fields
-	CCoeControl* focused = FindFocused();
+CCoeControl* focused = FindFocused();
-	if ( !IsAddressInputField( focused ) )
+if ( !IsAddressInputField( focused ) )
-	    {
+{
-	    return;
+return;
-	    }
+}
-	if ( aMatchString.CompareC( KNullDesC ) == 0 ||
+if ( aMatchString.CompareC( KNullDesC ) == 0 ||
-	     aMatchString.Compare( KAddressDelimeterSemiColon ) == 0 )
+aMatchString.Compare( KAddressDelimeterSemiColon ) == 0 )
-		{
+{
-		ClosePopupContactListL();
+ClosePopupContactListL();
-		return;
+return;
-		}
+}
-	if( !iAacListBox->IsVisible() )
+if( !iAacListBox->IsVisible() )
-		{
+{
 iAacListBox->SetPopupMaxRect( CalculatePopupRect() );
 iAacListBox->InitAndSearchL( aMatchString, 1 );
 iAacListBox->ActivateL();
-		}
+}
-	else
+else
-		{
+{
-		iAacListBox->SetSearchTextL( aMatchString );
+iAacListBox->SetSearchTextL( aMatchString );
-		}
+}
-	}
+}
 // -----------------------------------------------------------------------------
 // CNcsHeaderContainer::ClosePopupContactListL()
 // -----------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::ClosePopupContactListL()
-	{
+{
 FUNC_LOG;
 if ( iAacListBox->IsVisible() )
 {
-iAacListBox->MakeVisible( EFalse );
+iAacListBox->ClosePopupL();
-ShowPopupMenuBarL( EFalse );
+}
 // The focused address field should be redrawn after the popup is
 // closed to fix the field border.
 if ( iToField->IsFocused() )
 {
 iToField->DrawDeferred();
 }
 else if ( iCcField->IsFocused() )
 {
 iCcField->DrawDeferred();
 }
 else if ( iBccField->IsFocused() )
 {
 iBccField->DrawDeferred();
 }
 }
-	}
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::ShowPopupMenuBarL
 // ---------------------------------------------------------------------------
 //
 	{
 FUNC_LOG;
 	iSubjectField->SelectAllTextL();
 	}
-// -----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // CNcsHeaderContainer::CalculatePopupRect
-// -----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
 TRect CNcsHeaderContainer::CalculatePopupRect()
 {
 FUNC_LOG;
 // get focused control rect
 TRect popupRect;
 static_cast<CNcsAddressInputField*>( focused );
 TPoint editorPos = aifEditor->Editor()->PositionRelativeToScreen();
 TRect editorRect = aifEditor->Editor()->Rect();
-popupRect.iTl = TPoint( editorPos.iX,
+// When layouts are available we'll use them. Until that these are now
-editorPos.iY + aifEditor->CursorPosition() + 1 );
+// hardcoded!
+TInt tlXPos = 3;
-popupRect.iBr = TPoint( editorPos.iX + editorRect.Width(),
+TInt tlYPos = editorPos.iY + aifEditor->CursorPosition() + 1;
+if ( Layout_Meta_Data::IsLandscapeOrientation() &&
+iSplitScreenVKBEnabled )
+{
+tlXPos = iAvkonAppUi->ApplicationRect().Width() / 2;
+tlYPos = 3;
+}
+popupRect.iTl = TPoint( tlXPos, tlYPos );
+popupRect.iBr = TPoint( iAvkonAppUi->ApplicationRect().iBr.iX  - 3,
 iParent.PositionRelativeToScreen().iY + iParent.Rect().Height() );
 }
 return popupRect;
 }
 	{
 FUNC_LOG;
 __ASSERT_DEBUG( iAacListBox, Panic( ENcsBasicUi ) );
 __ASSERT_DEBUG( &iMailBox, Panic( ENcsBasicUi ) );
-	if( iAacListBox->IsRemoteLookupItemSelected() )
+	if ( iAacListBox->IsRemoteLookupItemSelected() )
 		{
 		CCoeControl* focused = FindFocused();
 		if ( IsAddressInputField( focused ) )
 		    {
 FUNC_LOG;
 TInt totalLineCount( 0 );
 CCoeControlArray::TCursor cur = Components().Begin();
 do
 {
 totalLineCount += ToNcsControl( cur )->LayoutLineCount();
 }
 while ( cur.Next() );
 return totalLineCount;
 }
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::IsAddressInputField
 // ---------------------------------------------------------------------------
 //
 TBool CNcsHeaderContainer::IsAddressInputField(
 static_cast<CNcsComposeViewContainer*>( &iParent );
 container->AppendAddressesL();
 }
 void CNcsHeaderContainer::FixSemicolonInAddressFieldsL()
-	{
+{
-		iToField->FixSemicolonAtTheEndL();
+iToField->FixSemicolonAtTheEndL();
-		iCcField->FixSemicolonAtTheEndL();
+iCcField->FixSemicolonAtTheEndL();
-		iBccField->FixSemicolonAtTheEndL();
+iBccField->FixSemicolonAtTheEndL();
-	}
+}
 TBool CNcsHeaderContainer::IsRemoteSearchInprogress() const
 {
 return iRALInProgress;
 }
 container->CommitL( ESubjectField );
 }
 }
 }
-// -----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
-// CNcsHeaderContainer::DoScroll
+// Scrolls editor to make cursor visible, if it is outside the visible area
-// -----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 //
 void CNcsHeaderContainer::DoScroll()
 {
 // scroll the screen if the cursor goes beyond the screen
-CNcsComposeViewContainer& parent = static_cast<CNcsComposeViewContainer&>( iParent );
+CNcsComposeViewContainer& parent =
+static_cast<CNcsComposeViewContainer&>( iParent );
-TInt screenPos( -Position().iY );
-TInt cursorPos( CursorPosition() );
+// Scrolling based on cursor line number can only be done when
-TInt lineHeight( Rect().Height() / LineCount() );
+// header composer and one of its fields is focused.
-TInt screenHeight( parent.Rect().Height() );
+if ( IsFocused() )
+{
-if ( cursorPos - lineHeight < screenPos )
+const TRect rect = Rect();
-{
+const TInt screenPos =  iOrigin.iY - rect.iTl.iY;
-screenPos = cursorPos - lineHeight;
+const TInt screenHeight = parent.VisibleAreaHeight();
-}
-else if( cursorPos + lineHeight > screenPos + screenHeight )
+const TInt lineNumber = CursorLineNumber();
-{
+const TInt lineHeight = rect.Height() / LineCount();
-screenPos = cursorPos + lineHeight - screenHeight;
+const TInt linePos = lineNumber * lineHeight;
-}
+TInt targetPos = screenPos;
-parent.Scroll( screenPos );
+if ( linePos - lineHeight < screenPos )
+{
+targetPos = linePos - lineHeight;
+}
+else if ( linePos + lineHeight > screenPos + screenHeight )
+{
+targetPos = linePos + lineHeight - screenHeight;
+}
+parent.Scroll( targetPos );
+}
+}
+// ---------------------------------------------------------------------------
+// Scrolls focused editor line to the top of visible area.
+// ---------------------------------------------------------------------------
+//
+void CNcsHeaderContainer::DoScrollFocusToTop()
+{
+CNcsComposeViewContainer& parent =
+static_cast<CNcsComposeViewContainer&>( iParent );
+// Calculate the position of the focused editor line.
+const TRect rect = Rect();
+const TInt lineNumber = CursorLineNumber();
+const TInt lineHeight = rect.Height() / LineCount();
+const TInt targetPos = ( lineNumber - 1 ) * lineHeight;
+parent.Scroll( targetPos );
 }
 // ---------------------------------------------------------------------------
 // CNcsHeaderContainer::SetPhysicsEmulationOngoing
 // ---------------------------------------------------------------------------
 iToField->SetPhysicsEmulationOngoing( aPhysOngoing );
 iCcField->SetPhysicsEmulationOngoing( aPhysOngoing );
 iBccField->SetPhysicsEmulationOngoing( aPhysOngoing );
 iSubjectField->SetPhysicsEmulationOngoing( aPhysOngoing );
 }
+// ---------------------------------------------------------------------------
+// CNcsHeaderContainer::HandleResourceChange
+// ---------------------------------------------------------------------------
+//
+void CNcsHeaderContainer::HandleResourceChange( TInt aType )
+{
+FUNC_LOG;
+CCoeControl::HandleResourceChange( aType );
+if ( aType == KAknSplitInputEnabled || aType == KAknSplitInputDisabled )
+{
+iSplitScreenVKBEnabled = ( aType == KAknSplitInputEnabled );
+if ( iAacListBox->IsVisible() )
+{
+iAacListBox->SetPopupMaxRect( CalculatePopupRect() );
+}
+}
+}
+// ---------------------------------------------------------------------------
+// Set origin for header's top position.
+// ---------------------------------------------------------------------------
+//
+void CNcsHeaderContainer::SetOrigin( TPoint& aOrigin )
+{
+iOrigin = aOrigin;
+}

branch	RCL_3
changeset 73	c8382f7b54ef
parent 64	3533d4323edc
child 80	726fba06891a