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

equal deleted inserted replaced

-:da5135c61bad
+:cd2816114bd1
 FUNC_LOG;
 SetMopParent( &iView );
 CreateWindowL();
+if ( CAknPhysics::FeatureEnabled() )
+{
+iPhysics = CAknPhysics::NewL( *this, this );
+}
 // Setup the control array
 InitComponentArrayL();
 CCoeControlArray& controls = Components();
 controls.SetControlsOwnedExternally( ETrue );
 // Create the header field
-iHeader = CNcsHeaderContainer::NewL( *this, iMailBox, aFlags );
+iHeader = CNcsHeaderContainer::NewL( *this, iMailBox, aFlags, iPhysics );
 controls.AppendLC( iHeader );
 CleanupStack::Pop( iHeader );
 // Create 'message body' field, default text is empty for that field
 iMessageField = new ( ELeave ) CNcsEditor( this, EFalse, ENcsEditorBody );
 iMessageField->SetContainerWindowL( *this );
 iMessageField->ConstructL( this, 0, 0 );
 iMessageField->SetAlignment( EAknEditorAlignBidi );
 iMessageField->SetAknEditorInputMode( EAknEditorTextInputMode );
+iMessageField->EnableKineticScrollingL( iPhysics );
 controls.AppendLC( iMessageField );
 CleanupStack::Pop( iMessageField );
 iMessageField->SetNcsFontType( NcsUtility::ENcsBodytextFont );
 CleanupStack::Pop( iReadOnlyQuoteField );
 // Listen edwin events and size events from smart quote field
 iReadOnlyQuoteField->AddEdwinObserverL( this );
 iReadOnlyQuoteField->SetEdwinSizeObserver( this );
+iReadOnlyQuoteField->EnableKineticScrollingL( iPhysics );
 // Create the scroll bar
 iScrollBar = new( ELeave ) CAknDoubleSpanScrollBar( this );
-iScrollBar->ConstructL(
+iScrollBar->ConstructL( ETrue, this, this, CEikScrollBar::EVertical,
-this, this, CEikScrollBar::EVertical, aRect.Height() );
+aRect.Height() );
-iScrollBar->MakeVisible( ETrue );
+iScrollBar->MakeVisible( EFalse );
 iScrollBar->SetModelL( &iScrollBarModel );
+controls.AppendLC( iScrollBar );
+CleanupStack::Pop( iScrollBar );
 iMessageField->SetupEditorL();
 iReadOnlyQuoteField->SetupEditorL();
 SetRect( aRect );
 iBgContext = CAknsBasicBackgroundControlContext::NewL(
 KAknsIIDQsnBgAreaMain, Rect(), EFalse );
 iLongTapDetector = CAknLongTapDetector::NewL( this );
-UpdateScrollBarL();
 ActivateL();
+DrawDeferred();
 // activate auto save functionality
 iAutoSaver.Enable( ETrue );
-if ( CAknPhysics::FeatureEnabled() )
-{
-iPhysics = CAknPhysics::NewL( *this, this );
-}
 }
 // ---------------------------------------------------------------------------
 // CNcsComposeViewContainer::~CNcsComposeViewContainer
 // Destructor
 }
 else
 {
 iFocused->SetFocus( ETrue, aDrawNow );
 }
-	iView.HandleContainerChangeRequiringToolbarRefresh();
+iView.HandleContainerChangeRequiringToolbarRefresh();
 	if ( aDrawNow )
 	    {
 		DrawNow();
 	    }
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::HandlePointerEventL(
 const TPointerEvent& aPointerEvent )
 {
-	FUNC_LOG;
+FUNC_LOG;
 CCoeControl::HandlePointerEventL( aPointerEvent );
 if ( aPointerEvent.iType != TPointerEvent::EButton1Down &&
 iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
 	case TPointerEvent::EButton1Down:
 		{
 // Save current and original position so that those can be used in
 // drag/scrolling calculations
 iPreviousPosition = iOriginalPosition =
-aPointerEvent.iParentPosition;
+aPointerEvent.iPosition;
 iIsDragging = EFalse;
 iIsFlicking = EFalse;
 if( iPhysics )
 {
 {
 					if( iMessageField->SelectionLength() )
 						{
 						iMessageField->ClearSelectionL();
 						}
-iMessageField->SetFocus( EFalse, EDrawNow );
+iMessageField->SetFocus( EFalse, ENoDrawNow );
 iFocused = iHeader;
-iHeader->SetFocus( ETrue,EDrawNow );
+iHeader->SetFocus( ETrue,ENoDrawNow );
 iHeader->MakeVisible( ETrue );
 CommitL( EBodyField );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 else if ( iFocused == iReadOnlyQuoteField )
 {
 iFocused = iMessageField;
-iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow );
+iReadOnlyQuoteField->SetFocus( EFalse, ENoDrawNow );
-iHeader->SetFocus( ETrue, EDrawNow );
+iHeader->SetFocus( ETrue, ENoDrawNow );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 }
 else if ( iReadOnlyQuoteField->Rect().Contains(
 aPointerEvent.iPosition ) )
 {
 if ( iFocused == iMessageField )
 {
 iFocused = iReadOnlyQuoteField;
-iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
+iReadOnlyQuoteField->SetFocus( ETrue, ENoDrawNow );
-iMessageField->SetFocus( EFalse, EDrawNow );
+iMessageField->SetFocus( EFalse, ENoDrawNow );
 iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 else if ( iFocused == iHeader )
 {
 iFocused = iReadOnlyQuoteField;
-iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
+iReadOnlyQuoteField->SetFocus( ETrue, ENoDrawNow );
-iHeader->SetFocus( EFalse, EDrawNow );
+iHeader->SetFocus( EFalse, ENoDrawNow );
 iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 }
 else
 {
 if ( iFocused == iHeader )
 {
 //TRAP_IGNORE( DoUpdateSubjectL() );
-					iHeader->SetFocus( EFalse, EDrawNow );
+iHeader->SetFocus( EFalse, ENoDrawNow );
-					iFocused = iMessageField;
+iFocused = iMessageField;
-iMessageField->SetFocus( ETrue, EDrawNow );
+iMessageField->SetFocus( ETrue, ENoDrawNow );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 else if ( iFocused == iReadOnlyQuoteField )
 {
 iFocused = iMessageField;
-iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow );
+iReadOnlyQuoteField->SetFocus( EFalse, ENoDrawNow );
-iMessageField->SetFocus( ETrue, EDrawNow );
+iMessageField->SetFocus( ETrue, ENoDrawNow );
 iView.HandleContainerChangeRequiringToolbarRefresh();
 }
 else
 {
+					iMessageField->ClearSelectionL();
 const TRect messageFieldRect( iMessageField->Rect() );
 if ( !messageFieldRect.Contains( aPointerEvent.iPosition ) &&
 aPointerEvent.iPosition.iY >= messageFieldRect.iTl.iY )
 {
 iMessageField->OpenVirtualKeyBoardL();
 		break;
 		}
 	case TPointerEvent::EDrag:
 		{
-		// Get current pointer position
+if ( !iIsDragging )
-		TPoint position = aPointerEvent.iParentPosition;
+{
+TInt drag( iOriginalPosition.iY - aPointerEvent.iPosition.iY );
-		// If user started dragging, cancel hotspot actions
+if ( Abs( drag ) > iPhysics->DragThreshold() )
-iIsDragging = ETrue;
+{
+					// If user started dragging, cancel hotspot actions
+					iIsDragging = ETrue;
+}
+}
+// Get current pointer position
+TPoint position = aPointerEvent.iPosition;
 if( iPhysics )
 {
-TPoint delta( 0, iPreviousPosition.iY - position.iY );
+			   if ( iIsDragging )
-iPhysics->RegisterPanningPosition( delta );
+				   {
+TPoint delta( 0, iPreviousPosition.iY - position.iY );
+if ( !iMessageField->SelectionLength() )
+		iPhysics->RegisterPanningPosition( delta );
+				   }
 }
 else
 {
 			TInt topPosition( -iHeader->Position().iY );
 		// unknown event, ignored
 		break;
 		}
 	}
-if( iFocused == iMessageField )
-	{
-	iMessageField->HandleTextChangedL();
-	}
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
 iHeader->NeedsLongTapL( aPointerEvent.iPosition ) )
 {
 iLongTapDetector->PointerEventL( aPointerEvent );
 }
 ret = ChangeFocusL( aKeyEvent );
 }
 if ( ret != EKeyWasConsumed )
 {
-	DrawNow();
+DrawDeferred();
 }
 }
 if ( ret == EKeyWasNotConsumed )
 {
-ret = iFocused->OfferKeyEventL( aKeyEvent, aType );
+if ( iFocused )
+ret = iFocused->OfferKeyEventL( aKeyEvent, aType );
 if( aType == EEventKeyUp )
 	iView.HandleContainerChangeRequiringToolbarRefresh();
 // Report user activity to auto saver if editor field handled the
 // event. In case of message field (body text), EKeyWasConsumed
 TKeyResponse ret( EKeyWasNotConsumed );
 if ( iFocused == iReadOnlyQuoteField && aKeyEvent.iCode == EKeyUpArrow )
 {
 iFocused = iMessageField;
-iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow );
+iReadOnlyQuoteField->SetFocus( EFalse, ENoDrawNow );
-iMessageField->SetFocus( ETrue, EDrawNow );
+iMessageField->SetFocus( ETrue, ENoDrawNow );
 ret = EKeyWasConsumed;
 }
 else if ( iFocused == iMessageField )
-	    {
+{
-	    if ( aKeyEvent.iCode == EKeyUpArrow )
+if ( aKeyEvent.iCode == EKeyUpArrow )
-	        {
+{
 iFocused = iHeader;
-		iHeader->SetFocus( ETrue,EDrawNow );
+iHeader->SetFocus( ETrue, ENoDrawNow );
-		iMessageField->SetFocus( EFalse, EDrawNow );
+iMessageField->SetFocus( EFalse, ENoDrawNow );
-		iHeader->MakeVisible( ETrue );
+iHeader->MakeVisible( ETrue );
+iHeader->ShowCursor( ETrue );
 CommitL( EBodyField );
 ret = EKeyWasConsumed;
-	        }
+}
-	    else if ( aKeyEvent.iCode == EKeyDownArrow &&
+else if ( aKeyEvent.iCode == EKeyDownArrow &&
-	              iReadOnlyQuoteField->TextLength() )
+iReadOnlyQuoteField->TextLength() )
-	        {
+{
-	        // Focus move to read-only quote only if there is some text in it.
+// Focus move to read-only quote only if there is some text in it.
-	        iFocused = iReadOnlyQuoteField;
+iFocused = iReadOnlyQuoteField;
-	        iReadOnlyQuoteField->SetFocus( ETrue, EDrawNow );
+iReadOnlyQuoteField->SetFocus( ETrue, ENoDrawNow );
-	        iMessageField->SetFocus( EFalse, EDrawNow );
+iMessageField->SetFocus( EFalse, ENoDrawNow );
-	        iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
+iReadOnlyQuoteField->SetCursorPosL( 0, EFalse );
-	        ret = EKeyWasConsumed;
+ret = EKeyWasConsumed;
-	        }
+}
 }
-	else if ( iFocused == iHeader && aKeyEvent.iCode == EKeyDownArrow )
+else if ( iFocused == iHeader && aKeyEvent.iCode == EKeyDownArrow )
 {
-		iFocused = iMessageField;
+iFocused = iMessageField;
-		iHeader->SetFocus( EFalse, EDrawNow );
+iHeader->SetFocus( EFalse, ENoDrawNow );
-		iMessageField->SetFocus( ETrue, EDrawNow );
+iMessageField->SetFocus( ETrue, ENoDrawNow );
 iMessageField->SetCursorPosL( 0, EFalse );
 ret = EKeyWasConsumed;
 }
 if ( ret == EKeyWasConsumed )
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::Draw() const
 // Draws the display
 // -----------------------------------------------------------------------------
 //
-void CNcsComposeViewContainer::Draw( const TRect& /*aRect*/ ) const
+void CNcsComposeViewContainer::Draw( const TRect& aRect ) const
 {
 FUNC_LOG;
-	if ( iBgContext )
+if ( iBgContext )
-	    {
+{
-	CWindowGc& gc = SystemGc();
+CWindowGc& gc = SystemGc();
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+if ( skin )
+{
-	if ( skin )
+AknsDrawUtils::Background( skin, iBgContext, this, gc, aRect );
-		{
+}
-		AknsDrawUtils::Background( skin, iBgContext, this, gc, Rect() );
+}
-		}
+}
-	    }
-}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetBodyContentL()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::UpdateScrollBarL()
 // -----------------------------------------------------------------------------
 //
 void CNcsComposeViewContainer::UpdateScrollBarL()
-	{
+{
 FUNC_LOG;
 TRect headerRect = iHeader->Rect();
 TRect bodyRect = iMessageField->Rect();
 TRect quoteRect = iReadOnlyQuoteField->Rect();
 iScrollBarModel.SetScrollSpan( totalComposerHeight );
 iScrollBarModel.SetWindowSize( visibleAreaHeight );
 iScrollBarModel.SetFocusPosition( visiblePosition );
 iScrollBar->SetModelL( &iScrollBarModel );
-iScrollBar->DrawNow();
+iScrollBar->MakeVisible( IsVisible() );
-	}
+}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::SetFocusToMessageFieldL()
 // -----------------------------------------------------------------------------
 //
 if( iFocused != iMessageField )
 {
 iHeader->SetFocus( EFalse, ENoDrawNow );
 iMessageField->SetCursorPosL( 0, EFalse );
-iMessageField->SetFocus( ETrue, EDrawNow );
+iMessageField->SetFocus( ETrue, ENoDrawNow );
 iFocused = iMessageField;
 UpdateScreenPositionL();
 DrawDeferred();
 }
 }
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::AddQuickTextL()
 // -----------------------------------------------------------------------------
 void CNcsComposeViewContainer::HandleSkinChangeL()
 {
 FUNC_LOG;
 if ( iHeader )
 {
-iHeader->HandleDynamicVariantSwitchL();
+iHeader->HandleSkinChangeL();
 }
 if ( iMessageField )
 {
 iMessageField->UpdateFontSize();
 //
 void CNcsComposeViewContainer::ScrollL( TInt aTargetPos )
 	{
 FUNC_LOG;
 	TPoint headerPos( iHeader->Position() );
-	aTargetPos = Max( 0, Min( aTargetPos,
-	                          ContentTotalHeight() - Rect().Height()) );
 	TInt moveY = -headerPos.iY - aTargetPos;
 	if( moveY )
 		{
 			}
 		iSeparatorLineYPos += moveY;
 		UpdateScrollBarL();
-		DrawNow();
+		DrawDeferred();
 		}
 	}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::ViewPositionChanged
 const TPoint& aNewPosition,
 TBool /*aDrawNow*/,
 TUint /*aFlags*/ )
 {
 FUNC_LOG;
-	if( iIsFlicking )
+	TInt scrollOffset = aNewPosition.iY - Rect().Size().iHeight / 2;
-		{
-		TInt scrollOffset = aNewPosition.iY - Rect().Size().iHeight / 2;
+	TRAP_IGNORE( ScrollL( scrollOffset ) );
-		TRAP_IGNORE( ScrollL( scrollOffset ) );
-		}
 	}
 // -----------------------------------------------------------------------------
 // CNcsComposeViewContainer::PhysicEmulationEnded
 // From MAknPhysicsObserver

branch	RCL_3
changeset 34	cd2816114bd1
parent 32	a3a1ae9acec6
child 19	b13141f05c3d