MCL/sf/mw/classicui: comparison uifw/EikStd/dlgsrc/EIKCAPC.CPP

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 /*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <avkon.mbg>
 // For MAknMfneCommandObserver
 #include <aknmfnecommandobserver.h>
 #endif //if defined( RD_SCALABLE_UI_V2)
-#include "akntrace.h"
 GLREF_C void Panic(TEikDialogPanic aPanic);
 const TInt KViewHighlightColor = 244 ;
+// const TInt KViewHighlightShadowColor = 222 ;
+// const TInt KNormalBackgroundColor = 0 ;
+// Do not reference these directly... Use MaximumNumberOfControlLinesOnVisiblePage()
+// const TInt KMaxControlLinesOnPageSingleLineFormat =6;
+// const TInt KMaxControlLinesOnPageDoubleLineFormat =5;
 enum
 {// must carry on from TSpaceSharingFlags
 EUsesEars       =0x10,
 ELeftEarDown    =0x20,
 EOfferAllHotKeys=0x8000,
 ETrailerAfterEar=0x10000,
 ENoBorder       = 0x20000
 };
+const TInt KDynamicEarMask=(ELeftEarDown|ERightEarDown|ELeftEarGrab|ERightEarGrab);
+const TInt KCapCDefaultHorzEdgeSpacing=0;
+const TInt KCapCDefaultVertEdgeSpacing=0;
 const TInt KCapCCenterSpacing=0;
 const TInt KControlTrailerSpacing=0;
+// const TInt KCapCEarHeightTopHalf=0;
+// const TInt KCapCEarHeightBottomHalf=0;
+// const TInt KCapCEarHeight=KCapCEarHeightTopHalf+KCapCEarHeightBottomHalf;
 const TInt KCapCEarWidth=0;
 const TInt KCapCEarSpacing=0;
 const TInt KCapCVertCaptionOffset=0;
 const TInt KCapCExtraAscent=KCapCVertCaptionOffset+0;
 const TInt KTrailCVertCaptionOffset=0;
 const TInt KCapCSeparatorAfterSpace=0;
+const TInt KCapCInitialEarRepeat=600000;    // 6 tenths of a second
+const TInt KCapCEarRepeat=100000; // one tenth of a second
 /*
 *  The following set of static functions return value which have been hard coded from the Series 60 Skins LAF v2.0
 *  If a layout DLL becomes available the hard-coded values may be replaced with equivalent Macros.
 *  NOTE THAT THERE ARE COPIES OF SOME OF THESE FUNCTIONS IN EIKDPAGE.CPP
 /**
 *
 * Extension class for additional data members.
 *
 */
-NONSHARABLE_CLASS( CEikCapCExtension ) : public CBase,
+NONSHARABLE_CLASS( CEikCapCExtension ): public MEikFormAnimObserver
-public MEikFormAnimObserver
 {
 friend class CEikCaptionedControl ;
 private:
 CEikCapCExtension();
 MTouchFeedback* iFeedback;
 public: // needs to be public because idle callback uses these members.
 	CIdle *iIdle;
 	CIdleCallbackData *iIdleData;
+/** iPartiallyVisible is used as a protection from changing subcontrol positions of
+* partially-visible controls in PositionFormComponents(). This is needed only for
+* dynamic screen size change.
+*/
+TBool iPartiallyVisible;
 /**
 * Boolean used to check if application is single touch compatible.
 */
 TBool iUsesSingleClick;
 iSelf( NULL ),
 iEditModeHighlightControlContext ( NULL ) ,
 iViewModeHighlightControlContext ( NULL ) ,
 iEditModeHighlightControlContextPressed( NULL ),
 iViewModeHighlightControlContextPressed( NULL ),
-iPreviousRect( 0, 0, 0, 0 ),
+iPreviousRect( TPoint(0, 0), TSize(0, 0) ) ,
 iPreviousState( EFalse ) ,
 iPressDownEffect( EFalse ),
 iXOffsetForDataPaneInEditMode( ELayoutEmpty ) ,
 iYOffsetForDataPaneInEditMode( ELayoutEmpty ) ,
 iDrawNoWhiteBackground( EFalse ),
 iAnimation( NULL )
 	, iIndicator(NULL),
 	iIndicator2(NULL),
 	iObserver(NULL),
-	iSimulatedDownEvent( EFalse ),
 iFeedback( MTouchFeedback::Instance() ),
 	iIdle(NULL),
-	iIdleData(NULL)
+	iIdleData(NULL),
-{
+iPartiallyVisible( EFalse )
-_AKNTRACE_FUNC_ENTER;
+{
 if ( iAvkonAppUi )
 {
 iUsesSingleClick = iAvkonAppUi->IsSingleClickCompatible();
 }
-_AKNTRACE_FUNC_EXIT;
+};
-}
 CEikCapCExtension::~CEikCapCExtension()
 {
-_AKNTRACE_FUNC_ENTER;
 // Remember to unacquire animation
 if( iAnimation && iSelf )
 {
 if( iSelf->iDialogPage )
 iSelf->iDialogPage->AcquireAnim( EFalse, this );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CEikCapCExtension::IsHighlightAnimated() const
 {
 if( iAnimation )
 return EFalse;
 }
 void CEikCapCExtension::SkinChanged()
 {
-_AKNTRACE_FUNC_ENTER;
 iAnimation = NULL;
 if( iSelf->iDialogPage )
 iAnimation = iSelf->iDialogPage->AcquireAnim( ETrue, this );
 if( iAnimation )
 {
 iAnimation->SetHighlightSize( iSelf->Rect().Size() );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCapCExtension::HandleLayoutSwitch( const TSize& aSize )
 {
-_AKNTRACE_FUNC_ENTER;
 if( iAnimation )
 {
 if( iAnimation->Size() == aSize )
 {
 // No need to resize, just change the background used
 else
 {
 iAnimation->SetHighlightSize( aSize );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCapCExtension::AnimFrameReady()
 {
 if( iSelf )
 // drawing, we only grab a piece from the list background bitmap.
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( iSelf->iDialogPage );
 return AknsDrawUtils::DrawBackground( skin, cc, iSelf->iDialogPage, aGc, TPoint(0,0),
-iSelf->Rect(), KAknsDrawParamRGBOnly );
+iSelf->ViewRect(), KAknsDrawParamRGBOnly );
 }
 void CEikCapCExtension::SimulatePointerEventToControlL(
 const TPointerEvent& aPointerEvent )
 // Extend form item touch area to whole item area
 if ( iSelf->iIsEditable
 && ( aPointerEvent.iType == TPointerEvent::EButton1Down
 || aPointerEvent.iType == TPointerEvent::EButton1Up ) )
 {
 // Check control type
 TBool edwinControl( LaunchInputType() );
 TBool simulate = EFalse;
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down
-if ( iSelf->Rect().Contains( aPointerEvent.iPosition ) )
+&& iSelf->Rect().Contains( aPointerEvent.iPosition )
-{
+&& !iSelf->iControl->Rect().Contains(
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down &&
+aPointerEvent.iPosition ) )
-!iSelf->iControl->Rect().Contains( aPointerEvent.iPosition ) )
+{
-{
+iSimulatedDownEvent = ETrue;
-iSimulatedDownEvent = ETrue;
+if ( !edwinControl )
+{
 simulate = ETrue;
 }
-else if ( aPointerEvent.iType == TPointerEvent::EButton1Up &&
+}
-iSimulatedDownEvent )
+else if ( aPointerEvent.iType == TPointerEvent::EButton1Up
-{
+&& iSimulatedDownEvent )
-simulate = ETrue;
+{
-}
+simulate = ETrue;
 }
 // Simulate pointer event to control
 if ( simulate && !edwinControl )
 {
 iSelf->iControl->Rect().iTl + TPoint( 1, 1 );
 iSelf->iControl->HandlePointerEventL( controlEvent );
 }
 // With edwin do action directly (due to cursor problems)
-else if ( edwinControl &&
+else if ( edwinControl && simulate
-simulate &&
+&& aPointerEvent.iType == TPointerEvent::EButton1Up )
-( aPointerEvent.iType == TPointerEvent::EButton1Up ||
+{
-aPointerEvent.iType == TPointerEvent::EButton1Down ) )
+CAknExtendedInputCapabilities* input( NULL );
-{
+iSelf->iControl->InputCapabilities().ObjectProvider(
-// Basic list feedback is given instead of sensitive edit
+)->MopGetObjectNoChaining( input );
-// feedback when tapping editor fields in forms.
+if ( input )
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
+{
-{
+iFeedback->InstantFeedback(
-iFeedback->InstantFeedback( iSelf->iControl,
+iSelf->iControl, ETouchFeedbackEditor,
-ETouchFeedbackList );
+ETouchFeedbackVibra, aPointerEvent );
-}
+input->ReportEventL(
-else
-{
-iFeedback->InstantFeedback( iSelf->iControl,
-ETouchFeedbackList,
-ETouchFeedbackVibra,
-aPointerEvent );
-CAknExtendedInputCapabilities* input( NULL );
-iSelf->iControl->InputCapabilities().ObjectProvider(
-)->MopGetObjectNoChaining( input );
-if ( input )
-{
-input->ReportEventL(
 CAknExtendedInputCapabilities::\
 MAknEventObserver::EActivatePenInputRequest,
 NULL );
 }
 }
-}
 if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
 iSimulatedDownEvent = EFalse;
 }
 }
 * This draws the form highlight line
 *
 */
 void CEikCaptionedControlFormHighlightLine::Draw(const TRect& /*aRect*/) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
 TBool drawn = EFalse;
 if ( IsVisible() && DrawingSkins() )
 {
 gc.SetPenColor( line3Rect.Color() ) ; // black line;
 gc.DrawRect(rectToDraw);
 }
 }
 }
-_AKNTRACE_FUNC_EXIT;
 };
 TInt CEikCaptionedControlFormHighlightLine::HeightOfHighlight(TTopOrBottom aTopOrBottom) const
 {
 }
 TBool CEikCaptionedControlFormHighlightLine::DrawingSkins() const
 {
-_AKNTRACE_FUNC_ENTER;
 TBool drawingSkins = EFalse;
 if ( AknsUtils::AvkonSkinEnabled() )
 {
 MAknsSkinInstance* skin = AknsUtils::SkinInstance() ;
 MAknsControlContext* cc = AknsDrawUtils::ControlContext( &iCapCtl ) ;
 CWindowGc& gc = SystemGc();
 drawingSkins = AknsDrawUtils::Background( skin, cc, this, gc, Rect(), KAknsDrawParamPrepareOnly );
 }
-_AKNTRACE_FUNC_EXIT;
 return drawingSkins;
 }
-EXPORT_C CEikCaptionedControl::CEikCaptionedControl()
+EXPORT_C CEikCaptionedControl::CEikCaptionedControl() : iHasAppendedEditIndicator(EFalse)
 {
-_AKNTRACE_FUNC_ENTER;
 iNumberOfLines = 1 ;  // default starting value
 AKNTASHOOK_ADD( this, "CEikCaptionedControl" );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CEikCaptionedControl::~CEikCaptionedControl()
 {
-_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_REMOVE();
 AknsUtils::DeregisterControlPosition(this);
 AknsUtils::DeregisterControlPosition(iBitmap);
 AknsUtils::DeregisterControlPosition(iCaption);
 AknsUtils::DeregisterControlPosition(iControl);
 iControl->SetFocus( EFalse);
 delete iControl;
 delete iCaptionText;
 delete iCaption;
 delete iTrailer;
+delete iToolTipText ;
 delete iBitmap ;
 delete iHighlightControl ;
 if ( iExtension )
 {
 		delete iExtension->iIdle;
 delete iExtension->iViewModeHighlightControlContextPressed;
 	    delete iExtension->iIndicator;
 		delete iExtension->iIndicator2;
 }
 delete iExtension ;
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CEikCaptionedControl::SetPointerEventObserver(MPointerEventObserver *aObserver)
 	{
 	if (iExtension)
 return KErrNone;
 }
 EXPORT_C TSize CEikCaptionedControl::MinimumSize()
 {
-_AKNTRACE_FUNC_ENTER;
 // NTBD Add an extra line for those with the label on a separate
 if ( iIsFormControl )
 {
 if (iControl->IsDimmed())
 {
 iSize = TSize( 0, 0) ;
-_AKNTRACE_FUNC_EXIT;
 return iSize;
 }
 // We can get the minimum size from the resource - and the size of the editor (EditorControlSize() in lines)
 CalculateNumberOfLinesForControl( ENotSupplied );
 iNumberOfLines = 0;
 }
 // ------------------------
 iSize = layout.Size();
-_AKNTRACE_FUNC_EXIT;
 return ( iSize ) ;
 }
 else
 {
 TSize size=iControl->MinimumSize();
 if (iCapCFlags&EUsesEars)
 {
 size.iWidth+=KCapCEarWidth+KCapCEarSpacing;
 iCaptionWidth+=KCapCEarWidth+KCapCEarSpacing;
 }
-size.iWidth+=iCaptionWidth;
+size.iHeight+=2*iVertEdgeSpacing;
+size.iWidth+=iCaptionWidth+2*iHorzEdgeSpacing;
 if (iCapCFlags&ESeparatorAfter)
 size.iHeight+=KCapCSeparatorAfterSpace;
+iMinSize=size;
-_AKNTRACE_FUNC_EXIT;
+if ( iDoNotDisplay )
+// This flag is set if the control is not to be shown - so set it's height to zero
+iMinSize.iHeight = 0 ;
 return(size);
 }
 }
 /**
 * This routine should always called when any state affecting layout changed, including
 *
 * This is also called from Cone as a matter of course when SetRect is called on the object.
 */
 EXPORT_C void CEikCaptionedControl::SizeChanged()
 {
-_AKNTRACE_FUNC_ENTER;
 // Resize the animation
 if( iIsFormControl && iExtension->iAnimation )
 {
 iExtension->iAnimation->SetHighlightSize( Rect().Size() );
 }
 else if ( mfne )
 {
 mfne->SetSuppressBackgroundDrawing( EFalse );
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::StretchComponents()
 {
 if (iCapCFlags&EIfTooSmallDontStrech)
 	return;
-TRect rect(Rect());
+TRect rect=Rect();
+rect.Shrink(iHorzEdgeSpacing,iVertEdgeSpacing);
 if (iCapCFlags&ESeparatorAfter)
 rect.iBr.iY-=KCapCSeparatorAfterSpace;
 const CFont* editorFont = AknLayoutUtils::FontFromId( iEditorFontId ) ;
-TInt normalEditorHeight = editorFont->HeightInPixels() + editorFont->DescentInPixels();
+TInt normalEditorHeight = editorFont->HeightInPixels() + editorFont->DescentInPixels() + ( 2 * iVertEdgeSpacing ) ;
 if ( normalEditorHeight > rect.Height() )
 normalEditorHeight = rect.Height() ;
 // Insert Bitmap before caption
 // Note, if position of caption & bitmap is to be configurable this routine will have to be re structured
 if ( iBitmap )
 {
-TPoint bitmapTl( rect.iTl );
+TPoint bitmapTl = rect.iTl ;
-TSize bitmapSize( iBitmap->MinimumSize() );
+TSize bitmapSize = iBitmap->MinimumSize() ;
 if ( bitmapSize.iHeight > normalEditorHeight )
 {
 // reduce the size of the bitmap whilst retaining proportion. (will clip the bitmap methinks)
 TReal ratio = normalEditorHeight/bitmapSize.iHeight ;
 bitmapSize = TSize( TInt(bitmapSize.iWidth * ratio) , TInt(bitmapSize.iHeight * ratio) ) ;
 iCaption->SetExtent(capPos,capSize);
 if (iCapCFlags&EExtraAscent)
 rect.iTl.iY+=KCapCExtraAscent;
 }
 rect.iTl.iX+=iCaptionWidth;
+if ((iCapCFlags&EUsesEars) && !(iCapCFlags&ETrailerAfterEar))
+rect.iBr.iX-=(KCapCEarWidth+KCapCEarSpacing);
 if (iTrailer)
 {
 TSize trailSize=iTrailer->MinimumSize();
 TInt trailPosX=rect.iBr.iX-trailSize.iWidth;
 if(trailSize.iHeight+trailPosY>Rect().iBr.iY)
 trailSize.iHeight=Rect().iBr.iY-trailPosY;
 iTrailer->SetExtent(TPoint(trailPosX,trailPosY),trailSize);
 rect.iBr.iX=trailPosX-KControlTrailerSpacing;
 }
+if ((iCapCFlags&EUsesEars) && (iCapCFlags&ETrailerAfterEar))
+rect.iBr.iX-=(KCapCEarWidth+KCapCEarSpacing);
 if(iCapCFlags&EIfTooBigCtlStaysMinHeight && rect.Height()>iControl->MinimumSize().iHeight)
 rect.iBr.iY=rect.iTl.iY+iControl->MinimumSize().iHeight;
 if(iCapCFlags&EIfTooBigCtlStaysMinWidth && rect.Width()>iControl->MinimumSize().iWidth)
 rect.iBr.iX=rect.iTl.iX+iControl->MinimumSize().iWidth;
 iControl->SetRect(rect);
 }
+TInt CEikCaptionedControl::WidthForEars(TInt aWidthRemaining) const
+{
+TInt earWidth=0;
+if(iCapCFlags&EUsesEars)
+{
+const TInt earAndMarginWidth=KCapCEarWidth+KCapCEarSpacing;
+if(iTrailer || iCaption)
+{
+if(aWidthRemaining>(2+(iTrailer?1:0)+(iCaption?1:0))*earAndMarginWidth)
+earWidth=earAndMarginWidth;
+else if(aWidthRemaining>(2+(iTrailer?1:0)+(iCaption?1:0))*KCapCEarWidth)
+earWidth=KCapCEarWidth;
+}
+else
+earWidth=Min(aWidthRemaining/2,earAndMarginWidth);
+}
+return earWidth;
+}
 void CEikCaptionedControl::SquashComponents()
 {
 TRect rect=Rect();
 // Shrink for Separator
 if (iCapCFlags&ESeparatorAfter)
 rect.iBr.iY-=KCapCSeparatorAfterSpace;
 // Space required before the left of the control rect
-TInt desiredLeft=0;
+TInt desiredLeft=iHorzEdgeSpacing;
 if(iCaption)
 desiredLeft+=iCaption->MinimumSize().iWidth+KCapCCenterSpacing;
 if ( iBitmap )
 desiredLeft += iBitmap->MinimumSize().iWidth ; // + additional separation?
 // Space required after the right of the control rect
-TInt desiredRight=0;
+TInt desiredRight=iHorzEdgeSpacing;
 if(iTrailer)
 desiredRight+=iTrailer->MinimumSize().iWidth+KControlTrailerSpacing;
 // Decide on space for the control rect.
 TInt controlWidth=0;
 else
 controlWidth=Max(0,widthRemaining-(desiredLeft+desiredRight+2*(KCapCEarWidth+KCapCEarSpacing)));
 widthRemaining-=controlWidth;
 }
+// Decide if there is space for ears with margins, ears only, or no ears.
+TInt earWidth=WidthForEars(widthRemaining);
+widthRemaining-=2*earWidth;
 // Space assigned for before the left of the control rect
 TInt actualLeft=0;
 actualLeft=ScaledSubLength(widthRemaining,desiredLeft,desiredLeft+desiredRight);
 // Space assigned for after the right of the control rect
 TInt actualRight=widthRemaining-actualLeft;
 captionRect.iTl.iX+=actualLeft-actualCaption;
 captionRect.iBr.iX=captionRect.iTl.iX+actualCaption;
 if (iCapCFlags&EExtraAscent)
 rect.iTl.iY+=KCapCExtraAscent;
-if(actualLeft>2*(KCapCCenterSpacing))
+if(actualLeft>2*(KCapCCenterSpacing+iHorzEdgeSpacing))
 {
+captionRect.iTl.iX+=iHorzEdgeSpacing;
 captionRect.iBr.iX-=KCapCCenterSpacing;
 }
 const TSize capMin=iCaption->MinimumSize();
 iCaption->SetExtent(captionRect.iTl,TSize(Min(captionRect.Width(),capMin.iWidth)
 ,Min(captionRect.Height(),iCaption->MinimumSize().iHeight)));
 // Decide if there is room in actualRight for trailer only, or trailer with margins.
 if(iTrailer)
 {
 TInt leftAdjust=0;
 TInt rightAdjust=0;
-TRect trailerRect(rect);
+TRect trailerRect=rect;
-trailerRect.iTl.iX+=actualLeft+controlWidth;
+trailerRect.iTl.iX+=actualLeft+controlWidth+(iCapCFlags&EUsesEars ? earWidth : 0);
 trailerRect.iTl.iY+=KTrailCVertCaptionOffset;
-if(actualRight>2*(KControlTrailerSpacing))
+if(actualRight>2*(iHorzEdgeSpacing+KControlTrailerSpacing))
 {
-leftAdjust=KControlTrailerSpacing;
+if(iCapCFlags&ETrailerAfterEar)
-}
+{
+leftAdjust=KControlTrailerSpacing+earWidth;
+rightAdjust=iHorzEdgeSpacing;
+}
+else
+{
+rightAdjust=earWidth+iHorzEdgeSpacing;
+leftAdjust=KControlTrailerSpacing;
+}
+}
+else
+{
+if(iCapCFlags&ETrailerAfterEar)
+leftAdjust=earWidth;
+else
+rightAdjust=earWidth;
+}
 trailerRect.iTl.iX+=leftAdjust;
 trailerRect.iBr.iX-=rightAdjust;
 iTrailer->SetExtent(trailerRect.iTl,TSize(trailerRect.Width(),
 Min(trailerRect.Height(),iTrailer->MinimumSize().iHeight)));
 }
 // Position and set the controls space
 TRect controlRect=rect;
-controlRect.iTl.iX+=actualLeft;
+controlRect.iTl.iX+=actualLeft+earWidth;
-controlRect.iBr.iX-=actualRight;
+controlRect.iBr.iX-=(actualRight+earWidth);
 if(iCapCFlags&EIfTooBigCtlStaysMinHeight && controlRect.Height()>iControl->MinimumSize().iHeight)
 controlRect.iBr.iY=controlRect.iTl.iY+iControl->MinimumSize().iHeight;
 iControl->SetRect(controlRect);
-}
+}
 /**
 * Sets the flags, aFlags, (see TSpaceSharingFlags), which determine
 * the way space is distributed if the captioned control is given too
 }
 static TInt IdleCallback(TAny *aAny)
 {
-	_AKNTRACE_FUNC_ENTER;
 	CIdleCallbackData *data = (CIdleCallbackData*)aAny;
 	CEikCapCExtension *ext = data->iExt;
 	CEikCaptionedControl *ctrl = data->iCtrl;
 	CEikEdwin *edwin = (CEikEdwin*)ctrl->iControl;
 	TRAP_IGNORE ( edwin->SetCursorPosL( (textLength>=0 ? textLength : 0), EFalse) );
 	delete ext->iIdle;
 	ext->iIdle = NULL;
 	delete data;
 	ext->iIdleData = NULL;
-	_AKNTRACE_FUNC_EXIT;
 	return EFalse;
 }
-void CEikCaptionedControl::ScrollBackEditorL()
+void CEikCaptionedControl::ScrollBackEditor()
 {
-_AKNTRACE_FUNC_ENTER;
+//
-//
+		// For long single-line edwin, scroll horizontally to show beginning of the edwin
-// For long single-line edwin, scroll horizontally to show beginning
+		// when focus changes away from the edwin.
-// of the edwin when focus changes away from the edwin.
+		//
-//
+	if ( iIsEditable && ControlIsAnEdwin(iControlType) )
-if ( iIsEditable && ControlIsAnEdwin( iControlType ) )
+			{
-{
+			delete iExtension->iIdle;
-delete iExtension->iIdle;
+			delete iExtension->iIdleData;
-iExtension->iIdle = NULL;
+			iExtension->iIdleData = new (ELeave) CIdleCallbackData;
-delete iExtension->iIdleData;
+			iExtension->iIdleData->iCtrl = this;
-iExtension->iIdleData = NULL;
+			iExtension->iIdleData->iExt = iExtension;
-iExtension->iIdleData = new (ELeave) CIdleCallbackData;
+			iExtension->iIdle = CIdle::NewL(0);
-iExtension->iIdleData->iCtrl = this;
+			iExtension->iIdle->Start(TCallBack(&IdleCallback, iExtension->iIdleData));
-iExtension->iIdleData->iExt = iExtension;
+			}
-iExtension->iIdle = CIdle::NewL( 0 );
+}
-iExtension->iIdle->Start(
-TCallBack( &IdleCallback, iExtension->iIdleData ) );
-}
-_AKNTRACE_FUNC_EXIT;
-}
 EXPORT_C void CEikCaptionedControl::FocusChanged(TDrawNow aDrawNow)
 {
-_AKNTRACE_FUNC_ENTER;
 // Only form controls need to adapt animation to focus changes.
 if( iExtension->iAnimation && iIsFormControl )
 {
 // Pause animation when losing focus (other states ignored)
 if( !IsFocused() )
 {
 iExtension->iAnimation->Pause();
 }
 else if( iIsCurrentLine && !iIsEditable ) // Current and in view mode
 {
-CAknAppUi* aui = static_cast<CAknAppUi*>(iEikonEnv->AppUi());
+CAknAppUi* aui = static_cast<CAknAppUi*>(CEikonEnv::Static()->AppUi());
 if( aui->IsForeground() )
 {
 iExtension->iAnimation->Play();
 }
 }
 if (!focused)
 emphasis=(iCapCFlags&ECurrent? CEikLabel::EPartialEmphasis: CEikLabel::ENoEmphasis);
 iCaption->SetEmphasis(emphasis);
 }
 }
-_AKNTRACE_FUNC_EXIT;
-}
+if (aDrawNow && iCapCFlags&EUsesEars && IsReadyToDraw())
+DrawEarsNow(EBothEars);
+}
+void CEikCaptionedControl::DrawEarsNow(TWhichEars aEar) const
+{
+ActivateGc();
+DrawEars(aEar);
+DeactivateGc();
+}
+void CEikCaptionedControl::DrawEars(TWhichEars aEar) const
+{
+if (aEar&ELeftEar)
+DrawSingleEar(ELeftEar,iCapCFlags&ELeftEarDown);
+if (aEar&ERightEar)
+DrawSingleEar(ERightEar,iCapCFlags&ERightEarDown);
+}
+void CEikCaptionedControl::DrawSingleEar(TWhichEars /*aEar*/,TBool /*aPressed*/) const
+{
+// not needed in S60
+}
+TRect CEikCaptionedControl::EarRect(TWhichEars /*aEar*/) const
+{
+return(TRect(0,0,0,0)); // not needed in S60
+}
 EXPORT_C TInt CEikCaptionedControl::CountComponentControls() const
 {
 CCoeControl* controls[] =
 {
 }
 EXPORT_C void CEikCaptionedControl::Draw(const TRect& aRect) const
 {
-_AKNTRACE_FUNC_ENTER;
 if (iIsFormControl )
 DrawAsForm( aRect );
 else
 DrawAsEikonDialog( aRect );
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawAsForm( const TRect& aRect ) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
 gc.SetPenStyle(CGraphicsContext::ENullPen);
+if ( iRefresh )
+{
+gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
+gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
+}
 if ( iCaption )
 {
 // Draw ':' for edit indicator.  ( Skin independant )
 if ( iIsEditable && iIsCurrentLine )
 DrawAsFormInEditMode( aRect );
 else if (!iIsEditable && iIsCurrentLine )
 DrawAsFormInViewMode( aRect );
 else
 DrawAsFormUnFocusedLine( aRect );
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawAsFormInEditMode( const TRect& /*aRect*/ ) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
 gc.SetPenStyle(CGraphicsContext::ENullPen);
+if ( iRefresh )
+{
+gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
+gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
+}
 if (iDialogPage&& iHighlightControl)
 {
 TInt height(Rect().Height());
 TBool top = iDialogPage->VisibleSizeOnPage(height,iControl);
 );
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 gc.SetBrushStyle( CGraphicsContext::ENullBrush ) ;
 gc.SetPenColor( line2Rect.Color() ) ;
 gc.DrawRect(line2Rect.Rect());
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawAsFormInViewMode( const TRect& /*aRect*/ ) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
 gc.SetPenStyle(CGraphicsContext::ENullPen);
+if ( iRefresh )
+{
+gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
+gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
+}
 // This gives the correct Rect for using the Layout functions
-TRect viewRect( Rect() );
+TRect viewRect=ViewRect();
 TAknLayoutRect line1Rect;
 line1Rect.LayoutRect( viewRect, AKN_LAYOUT_WINDOW_List_pane_highlight_graphics__various__Line_1 (viewRect) );
 /* This is in view mode, and is the current line
 TPoint(iVerticalLineXPosition,Rect().iTl.iY+2));
 }
 gc.DrawLine(TPoint(iVerticalLineXPosition,Rect().iBr.iY-1),
 TPoint(iVerticalLineXPosition,Rect().iBr.iY+1));
-_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawAsFormUnFocusedLine( const TRect& /*aRect*/ ) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
+gc.SetPenStyle(CGraphicsContext::ENullPen);
+if ( iRefresh )
+{
+gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
+gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
+}
 gc.SetPenStyle(CGraphicsContext::ENullPen);
 gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
 gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 gc.SetPenColor(iEikonEnv->ControlColor(EColorDialogText,*this));
 gc.SetBrushStyle( CGraphicsContext::ENullBrush ) ;
 gc.DrawLine(TPoint(iVerticalLineXPosition,Rect().iTl.iY),
 TPoint(iVerticalLineXPosition,Rect().iBr.iY+1));
+// CEikCaptionedControl* visibleBelow=0; (NOT USED)
 if (iDialogPage)
 {
 // visibleBelow=iDialogPage->FindNextControlOnPageWithHeight(EFalse,this);
 //draw separator line unless This control is at or off the top of the page.
 TBool atTopOfPage = (iDialogPage && iDialogPage->IsAtOrOffTopOfPage(iControl) );
 if (HasSeparator() && !atTopOfPage)
 DrawFormSeparator( gc );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CEikCaptionedControl::TextColorIndex
 // ---------------------------------------------------------------------------
 //
 TAknsQsnTextColorsIndex CEikCaptionedControl::TextColorIndex() const
 {
-TAknsQsnTextColorsIndex colorIndex = EAknsCIQsnTextColorsCG6;
+TAknsQsnTextColorsIndex colorIndex = EAknsCIQsnTextColorsCG8;
 // Note control doesn't use highlight text color
 if ( iControlType != EAknCtNote )
 {
 if ( iIsCurrentLine && iDialogPage->HighlightVisible() )
 {
-colorIndex = EAknsCIQsnTextColorsCG8;
+colorIndex = EAknsCIQsnTextColorsCG10;
 }
 }
 return colorIndex;
 }
-void CEikCaptionedControl::DrawAsEikonDialog( const TRect& /*aRect*/ ) const
+void CEikCaptionedControl::DrawAsEikonDialog( const TRect& aRect ) const
 {
-_AKNTRACE_FUNC_ENTER;
 CWindowGc& gc=SystemGc();
 gc.SetPenStyle(CGraphicsContext::ENullPen);
 if (iHighlightControl)
 STATIC_CAST(CEikCaptionedControlFormHighlightLine*,iHighlightControl)->SetTopOrBottom(CEikCaptionedControlFormHighlightLine::EUnset);
+if ( iRefresh )
+{
+gc.SetBrushStyle( CGraphicsContext::ESolidBrush ) ;
+gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) ) ;
+}
+TRect redrawRect=Rect();
+redrawRect.Intersection(aRect);
 /*
 *
 * FIX TSW JTON-6HGAND - see also eikdpage.cpp
 *
 *    gc.DrawRect(redrawRect);
 *
 * Most likely other places using gc.Clear() ( or gc.DrawRect() as 'clear'
 * should be fixed also.
 */
 if (iCapCFlags&ESeparatorAfter)
 {
 TRect rect(Rect());
-TPoint separatorStartPt(rect.iTl.iX,rect.iBr.iY-1);
+TPoint separatorStartPt(rect.iTl.iX+iHorzEdgeSpacing/2,rect.iBr.iY-1);
-TPoint separatorEndPt(separatorStartPt.iX, separatorStartPt.iY);
+TPoint separatorEndPt(separatorStartPt.iX+(iFullWidth-iHorzEdgeSpacing), separatorStartPt.iY);
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 gc.SetPenColor(iEikonEnv->ControlColor(EColorWindowText, *this));
 gc.DrawLine(separatorStartPt, separatorEndPt);
-}
+};
-_AKNTRACE_FUNC_EXIT;
+if (iCapCFlags&EUsesEars)
+DrawEars(EBothEars);
 }
 /*
 * Method to return T/F whether this CEikCaptionedControl has a separator.
 */
 }
 EXPORT_C TKeyResponse CEikCaptionedControl::OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType)
 {
-_AKNTRACE_FUNC_ENTER;
 if ( !iIsFormControl)
 return iControl->OfferKeyEventL(aKeyEvent,aType);
 else if ( iIsFormControl && iIsEditable )
 {
 TKeyResponse retVal ;
 retVal = iControl->OfferKeyEventL( aKeyEvent, aType ) ;
-_AKNTRACE_FUNC_EXIT;
 return retVal ;
 }
 else
-_AKNTRACE_FUNC_EXIT;
 return EKeyWasNotConsumed ;
 }
 EXPORT_C TCoeInputCapabilities CEikCaptionedControl::InputCapabilities() const
 {
 return TCoeInputCapabilities(TCoeInputCapabilities::ENone, NULL, CONST_CAST(CEikCaptionedControl*, this));
 }
 EXPORT_C void CEikCaptionedControl::SetDimmed(TBool aDimmed)
 {
-_AKNTRACE_FUNC_ENTER;
 CCoeControl::SetDimmed(aDimmed);
 if (iControl && iControl->IsVisible())
 {
 iControl->SetDimmed(aDimmed);
 }
 }
 if (iTrailer)
 {
 iTrailer->SetDimmed(aDimmed);
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void* CEikCaptionedControl::ExtensionInterface( TUid /*aInterface*/ )
 {
 return NULL;
 }
 EXPORT_C void CEikCaptionedControl::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
-_AKNTRACE_FUNC_ENTER;
+if (!IsNonFocusing())
-TBool edwinControl( ControlIsAnEdwin( iControlType ) );
+{
+TWhichEars ear=ENoEar;
-if ( iIsFormControl )
+if (aPointerEvent.iType!=TPointerEvent::EButton1Down)
 {
-if ( !PressedDownState() &&
+if (iCapCFlags&ELeftEarGrab)
-aPointerEvent.iType == TPointerEvent::EButton1Down )
+ear=ELeftEar;
+else if (iCapCFlags&ERightEarGrab)
+ear=ERightEar;
+if (ear)
+{
+TInt oldDrawFlags=iCapCFlags&(ELeftEarDown|ERightEarDown);
+if (aPointerEvent.iType==TPointerEvent::EButton1Up)
+iCapCFlags&=(~KDynamicEarMask);
+else
+{
+iCapCFlags&=(~(ELeftEarDown|ERightEarDown));
+if (EarRect(ear).Contains(aPointerEvent.iPosition))
+{
+FireEarL(ear, KCapCEarRepeat);
+return;
+}
+}
+if (oldDrawFlags!=(iCapCFlags&(ELeftEarDown|ERightEarDown)))
+DrawEarsNow(ear);
+return;
+}
+}
+else if (iCapCFlags&EUsesEars)
+{
+iCapCFlags&=(~KDynamicEarMask);
+if (EarRect(ELeftEar).Contains(aPointerEvent.iPosition))
+ear=ELeftEar;
+else if (EarRect(ERightEar).Contains(aPointerEvent.iPosition))
+ear=ERightEar;
+if (ear)
+{
+FireEarL(ear, KCapCInitialEarRepeat);
+return;
+}
+}
+}
+if (iIsFormControl)
+{
+if ( PressedDownState()&&
+aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 SetPressedDownState( ETrue );
 DrawDeferred();
 }
-else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+else if(aPointerEvent.iType == TPointerEvent::EButton1Up)
 {
-_AKNTRACE( "TPointerEvent::EButton1Up" );
 SetPressedDownState( EFalse );
 DrawDeferred();
 }
-if ( ( aPointerEvent.iType == TPointerEvent::EButton1Down ||
-aPointerEvent.iType == TPointerEvent::EButton1Up ) &&
-iIsEditable &&
-edwinControl &&
-iExtension &&
-iExtension->iFeedback &&
-iControl->Rect().Contains( aPointerEvent.iPosition ) )
-{
-CEikEdwin* edwin = static_cast<CEikEdwin*>( iControl );
-if ( edwin &&
-( edwin->UserFlags() & CEikEdwin::EDisplayOnly ||
-edwin->IsReadOnly() ) )
-{
-// For edwins in view only mode we must produce the feedback
-// here, as the edwin itself doesn't.
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
-{
-iExtension->iFeedback->InstantFeedback( iControl,
-ETouchFeedbackList );
-}
-else
-{
-iExtension->iFeedback->InstantFeedback( iControl,
-ETouchFeedbackList,
-ETouchFeedbackVibra,
-aPointerEvent );
-}
-}
-}
 }
-if ( !iIsEditable && ( edwinControl || ControlIsAMfne( iControlType ) )
+if ( !iIsEditable && (ControlIsAnEdwin(iControlType) || ControlIsAMfne(iControlType))
 &&( iDialogPage && CEikDialogPage::EDouble == iDialogPage->FormLayout() ))
 {
-_AKNTRACE_FUNC_EXIT;
 		return;
 }
 CCoeControl::HandlePointerEventL(aPointerEvent);
-if ( iExtension && iIsFormControl )
+if ( iExtension )
 {
 iExtension->SimulatePointerEventToControlL( aPointerEvent );
 }
 }
+void CEikCaptionedControl::FireEarL(TWhichEars aEar, TInt aEarRepeat)
+{
+Window().RequestPointerRepeatEvent(aEarRepeat, EarRect(aEar));
+TKeyEvent key;
+key.iModifiers=0;
+if (aEar==ELeftEar)
+{
+key.iCode=EKeyLeftArrow;
+iCapCFlags|=ELeftEarDown|ELeftEarGrab;
+}
+else
+{
+key.iCode=EKeyRightArrow;
+iCapCFlags|=ERightEarDown|ERightEarGrab;
+}
+DrawEarsNow(aEar);
+iControl->OfferKeyEventL(key,EEventKey);
+}
 EXPORT_C void CEikCaptionedControl::SetCaptionL(const TDesC& aText)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("aText = %s", &aText);
 ConstructExtensionL() ; // One of several places where this is made
 if (!iCaption)
 {
 //      Retain a zero sized caption for formatting forms
 iCaption=new(ELeave) CEikCapCLabel;
 delete iCaptionText; // get rid of old iCaptionText
 iCaptionText=0;
 iCaptionText = aText.AllocL();
 }
-if (!iCaption->DrawableWindow())
+if (iCaption->DrawableWindow() == NULL)
 {
 iCaption->SetContainerWindowL(*this);
 iCaption->CopyControlContextFrom(this);
 }
 /*
 */
 if (iIsFormControl)
 DoFormCaptionSettingsL(aText);
 else
 iCaption->SetTextL(aText);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CEikCaptionedControl::SetDrawNoWhiteBackground(TBool aEnabled)
 {
 iExtension->iDrawNoWhiteBackground = aEnabled;
 }
 EXPORT_C void CEikCaptionedControl::SetTrailerL(const TDesC& aText)
 {
-_AKNTRACE_FUNC_ENTER;
 if (!aText.Length())
 return;
 if (!iTrailer)
 {
 iTrailer=new(ELeave) CEikLabel;
 iTrailer->CopyControlContextFrom(this);
 iTrailer->SetAllMarginsTo(1);
 iTrailer->SetNonFocusing();
 }
 iTrailer->SetTextL(aText);
-_AKNTRACE( "SetTextL = %s" , &aText);
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CEikCaptionedControl::SetCurrent(TBool aSelected)
 {
 SetCurrent( aSelected, ETrue );
 }
 EXPORT_C void CEikCaptionedControl::ConstructFromResourceL(TResourceReader& aReader)
 {
-_AKNTRACE_FUNC_ENTER;
 TPtrC capTextTPtrC = aReader.ReadTPtrC();
 iCaptionText = capTextTPtrC.AllocL();
 SetCaptionL(capTextTPtrC);
 iId=aReader.ReadInt16();
 TInt itemFlags=aReader.ReadInt32();
 // Process ToolTip
 TPtrC16 toolTip = aReader.ReadTPtrC() ;
 SetToolTipTextL( toolTip ) ;
+// Set the border spacing to the default value
+SetVertEdgeSpacing( KCapCDefaultVertEdgeSpacing ) ;
+SetHorzEdgeSpacing( KCapCDefaultHorzEdgeSpacing ) ;
 //Added to create new form box closer for edwins in forms.
 if (!iHighlightControl)
 {
 iHighlightControl = new(ELeave) CEikCaptionedControlFormHighlightLine( *this ) ;
 STATIC_CAST(CEikCaptionedControlFormHighlightLine*,iHighlightControl)->ConstructL() ;
 }
 ConstructExtensionL() ;
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CEikCaptionedControl::SetBitmapFromFileL( const TDesC& aFilename,TInt aMainId,TInt aMaskId /*=-1*/ )
 {
 }
 }
 EXPORT_C void CEikCaptionedControl::ResetMinimumSizes()
 {
-	_AKNTRACE_FUNC_ENTER;
+iMinSize.iWidth=0;
 iCaptionWidth=0;
-_AKNTRACE_FUNC_EXIT;
+iFullWidth=0;
 }
 EXPORT_C TBool CEikCaptionedControl::IsLatent() const
 {
 return(iCapCFlags&ELatent);
 *
 * @since ER5U
 */
 EXPORT_C void CEikCaptionedControl::GetColorUseListL(CArrayFix<TCoeColorUse>& aColorUseList) const
 {
-_AKNTRACE_FUNC_ENTER;
 CCoeControl::GetColorUseListL(aColorUseList);
 TCoeColorUse colorUse;
 colorUse.SetLogicalColor(EColorWindowText);
 colorUse.SetUse(TCoeColorUse::EFore|TCoeColorUse::EActive|TCoeColorUse::ESurrounds|TCoeColorUse::ENormal|TCoeColorUse::ENeutral);
 aColorUseList.AppendL(colorUse);
 const TInt count=CountComponentControls();
 for(TInt ii=0;ii<count;ii++)
 ComponentControl(ii)->GetColorUseListL(aColorUseList);
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Handles a change to the control's resources of type aType
 * which are shared across the environment, e.g. colors or fonts.
 *
 * @since ER5U
 */
 EXPORT_C void CEikCaptionedControl::HandleResourceChange(TInt aType)
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "[%s][%s][%d].", "CEikCaptionedControl", __FUNCTION__, aType );
 CCoeControl::HandleResourceChange(aType);
 // Animation is skin dependent, whenever skin changes animation changes
 // too.
 if( KAknsMessageSkinChange == aType )
 {
 iExtension->HandleLayoutSwitch( Rect().Size() );
 }
 DrawDeferred();
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /* Deactivated as requested in AISA-595AEZ
 */
 {
 }
 EXPORT_C const TDesC* CEikCaptionedControl::ToolTipText() const
 {
-return NULL ;
+if ( iToolTipText )
+return  iToolTipText ;
+else
+return NULL ;
 }
 /**
 * Writes the internal state of the control and its components to aStream.
 * Does nothing in release mode.
 EXPORT_C void CEikCaptionedControl::MCoeCaptionRetrieverForFep_Reserved_2()
 {}
 EXPORT_C void CEikCaptionedControl::SetEditableL( TBool aEditable, TBool /*aShowEmptyFields*/ )
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE( "CEikCaptionedControl::SetEditableL() aEditable: [%d]", aEditable );
 // Construct extension object if needed
 ConstructExtensionL() ;
 // Animation is not run when editing
 if( iIsFormControl && iExtension->iAnimation && aEditable )
 ResetMinimumSizes() ;
 LayoutSkinControlContexts();
 		if (IsReadyToDraw())
 			SizeChanged(); // needed because layout lines change when editable flag is switched.
 }
-_AKNTRACE_FUNC_EXIT;
+}
+void CEikCaptionedControl::SetVertEdgeSpacing( TInt aVertEdgeSpacing )
+{
+iVertEdgeSpacing = aVertEdgeSpacing ;
+}
+void CEikCaptionedControl::SetHorzEdgeSpacing( TInt aHorzEdgeSpacing )
+{
+iHorzEdgeSpacing = aHorzEdgeSpacing ;
 }
 /**
 * Avkon component positioning for Forms
 */
 void CEikCaptionedControl::PositionFormComponents()
 {
-_AKNTRACE_FUNC_ENTER;
+if( iExtension->iPartiallyVisible )
+return;
+TBool isFocused = iIsCurrentLine;
+TBool isSingleLineLayout = ( FormLayout() == CEikDialogPage::ESingle);
 MinimumSize() ;
+TBool hasBitmaps = ShowBitmap();
-// if control has no height, return now (no point laying out)
+/*
+if control has no height, return now (no point laying out)
+*/
 if (!Rect().Height())
 return;
-TBool isFocused = iIsCurrentLine;
-TBool isSingleLineLayout = ( FormLayout() == CEikDialogPage::ESingle);
-TBool hasBitmaps = ShowBitmap();
 TAknWindowLineLayout verticalLine = AKN_LAYOUT_WINDOW_List_pane_elements__single_heading__Line_1 ;
 // If double line layout update verticalLine
 if ( !isSingleLineLayout )
 {
 {
 verticalLine = AKN_LAYOUT_WINDOW_List_pane_lines__A_column__Line_1(0);
 }
 }
 }
+TRect parentRect = Rect();
 TAknLayoutRect layoutRect;
-layoutRect.LayoutRect( Rect(), verticalLine );
+layoutRect.LayoutRect( parentRect, verticalLine );
 TRect rectVerticalLine( layoutRect.Rect() );
 // set vertical line position.
 if ( AknLayoutUtils::LayoutMirrored() )
 {
 iVerticalLineXPosition = Rect().Width() - rectVerticalLine.iBr.iX;
 Each control type checks to see if it a user-defined control type is of that type, using the
 ConvertCustomControlTypeToBaseControlType mechanism so if the code gets here, the control is
 "none of the above".
 */
 Panic(EEikFormPanicUnknownControlType);
-}
+};
+//TRect layoutRectOfDataPane =(iIsEditable)? EditRect() : ViewRect();
 //view and edit data pane rect should be the same
-TRect layoutRectOfDataPane( Rect() );
+TRect layoutRectOfDataPane = ViewRect();
 if ( hasBitmaps )
 {
 if (iBitmap)
 FormLayoutControlBitmap
 default:
 Panic(EEikFormPanicLayoutErrorUnknownControlType);
 }
 TRAP_IGNORE( SetElementTextColorsL(TRgb()));
-_AKNTRACE_FUNC_EXIT;
 }
 TBool CEikCaptionedControl::ShowBitmap() const
 {
 return (iFlags & EEikFormShowBitmaps);
 else
 {
 AknLayoutUtils::LayoutLabel( iCaption, aRect, R_AVKON_FORM_LABEL_NO_ICON ) ;
 }
 }
+}
+TSize CEikCaptionedControl::EditorControlSize() const
+{
+return iEditorControlSize ;
 }
 TInt CEikCaptionedControl::NumberOfLines() const
 	{
 	return iNumberOfLines;
 	}
+TInt CEikCaptionedControl::NumberOfLinesForScrollBar() const
+	{
+	if ( FormLayout() == CEikDialogPage::ESingle ) return NumberOfLines();
+	return NumberOfLines()+1;
+	}
 /**
 * Recalculates the number of required lines for a control.
 */
 void CEikCaptionedControl::CalculateNumberOfLinesForControl( TInt aLines )
 {
-	_AKNTRACE_FUNC_ENTER;
 // NB if new control types are added, ones which should be invisible in view mode
 // should be also added to IsDisplayable().
 if ( aLines == ENotSupplied )
 {
 // Function has to be aware of edit/view state.
 else
 aLines=1;
 }
 }
 iNumberOfLines = aLines ;
-_AKNTRACE( "iNumberOfLines: [%d]", iNumberOfLines );
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CEikCaptionedControl::SetFormFlags( TInt aFlags )
 {
 iFlags = aFlags ;
 if(ControlIsAnEdwin(iControlType))
 {
 AknLayoutUtils::OverrideControlColorL(*this, EColorControlText, textColor );
 }
-}
+}
+/**
+* Retrieves the Series 60 European LAF layout values from avkon.rh
+*
+*/
+void CEikCaptionedControl::GetAknLayoutValuesL()
+{
+TAknWindowLineLayout l = AknLayoutScalable_Avkon::form_field_data_pane(0).LayoutLine();
+TRect parentRect = iAvkonAppUi->ClientRect();
+TAknLayoutRect layoutRect;
+layoutRect.LayoutRect( parentRect, l );
+TRect rectDataPane( layoutRect.Rect() );
+iAknFormControlWidth = rectDataPane.Width();
+iAknFormControlHeight = rectDataPane.Height();
+}
 TBool   CEikCaptionedControl::IsDisplayable() const
 {
 /*
 Added to provide whether the control should be displayed without calls to minimumsize.
 case EEikCtNumberEditor:
 case EAknCtLocationEditor:
 case EAknCtUnitEditor:
 return ETrue;
 }
-if (iDialogPage)
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
-{
+if (typeOfControlToLayout==MEikDialogPageObserver::EMfneDerived)
-	    TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+return ETrue;
-if (typeOfControlToLayout==MEikDialogPageObserver::EMfneDerived)
-return ETrue;
-}
 return EFalse;
 }
 TBool CEikCaptionedControl::ControlIsAPopfield(TInt aControlType) const
 {
 {
 case EEikCtSecretEd:
 case EAknCtNumericSecretEditor:
 return ETrue;
 }
-if (iDialogPage)
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
-{
+if (typeOfControlToLayout==MEikDialogPageObserver::ESecretEditorDerived)
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+return ETrue;
-if (typeOfControlToLayout==MEikDialogPageObserver::ESecretEditorDerived)
-return ETrue;
-}
 return EFalse;
 }
 TBool CEikCaptionedControl::ControlIsASlider(TInt aControlType) const
 {
 switch (aControlType)
 {
 case EAknCtSlider :
 return ETrue;
 }
-if (iDialogPage)
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
-{
+if (typeOfControlToLayout==MEikDialogPageObserver::ESliderDerived)
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+return ETrue;
-if (typeOfControlToLayout==MEikDialogPageObserver::ESliderDerived)
-return ETrue;
-}
 return EFalse;
 }
 //------------------------------------------------------------------------
 // CEikCaptionedControl::ControlIsAColourSelGrid
 case EAknCtColourSelectionDialogGrid :   // Deprecated
 case EAknCtColourSelectionGridDialog :
 case EAknCtColourSelectionDialogNoneField:
 return ETrue;
 }
-if (iDialogPage)
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
-{
+if (typeOfControlToLayout==MEikDialogPageObserver::EColourSelectionGridDerived)
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+return ETrue;
-if (typeOfControlToLayout==MEikDialogPageObserver::EColourSelectionGridDerived)
-return ETrue;
-}
 return EFalse;
 }
 void CEikCaptionedControl::DoFormCaptionSettingsL(const TDesC& aText)
 {
 EXPORT_C const TPtrC CEikCaptionedControl::GetFullCaptionText() const
 {
 return *iCaptionText;
-}
+};
 void CEikCaptionedControl::RegisterPageWithCaptionControl(CEikDialogPage* aPage)
 {
 iDialogPage=aPage;
-}
+};
 TInt CEikCaptionedControl::MaximumNumberOfControlLinesOnVisiblePage() const
 {
-	_AKNTRACE_FUNC_ENTER;
 	TInt maxItems = 0;
 	TAknLayoutScalableParameterLimits paneLimits;
 	if (IsPopupField(this))
 	{
 if (iDialogPage&& CEikDialogPage::EDouble == iDialogPage->FormLayout())
 TInt defineHeight = static_cast<CEikEdwin*>( iControl )->MaximumHeightInLines();
 if ( defineHeight && defineHeight < maxItems )
 return defineHeight;
 }
 	//maxItems -= 1; // TODO: this is a temporary workaround for layout data being incorrect, it has too many options available
-_AKNTRACE( "maxItems: [%d]", maxItems );
-_AKNTRACE_FUNC_EXIT;
 return maxItems;
-}
+};
+TRect CEikCaptionedControl::ViewRect() const
+{
+/*
+The Rect that the view mode is expecting is:
+176 across
+21 high
+set from 0,0
+We are
+174 across
+23 high
+set from (1,1) relative to viewwin.
+To convert we must:
+* Shrink(-1,1) to make Y cord and size equal, and X coord equal.
+* add 1 to the BR X coord. to make X size equal.
+*/
+TRect viewRectConversion(EditRect());
+viewRectConversion.Shrink(0,1);
+return viewRectConversion;
+}
+TRect CEikCaptionedControl::EditRect() const
+{
+//The Rect provided by Rect() is fine
+return Rect();
+}
 void CEikCaptionedControl::FormLayoutControlBitmap(CEikImage* aBitmap, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines)
 {
 if (!aNumberOfLines)
 return;
 AknLayoutUtils::LayoutEdwin( aEdwin, layoutRect, textLayout,
 colorIndex, 0, ETrue );
 	SetScrollRect(aEdwin, layoutRect, textLayout, aNumberOfLines);
 	    }
-	aEdwin->SetSuppressBackgroundDrawing(!aIsEditable);
+	TBool isviewmode = !aIsEditable;
+	aEdwin->SetSuppressBackgroundDrawing(isviewmode);
 }
 // Labels
 void CEikCaptionedControl::FormLayoutControlLabel(
 TAknTextLineLayout textLayout( AKN_LAYOUT_TEXT_Form_data_field_texts_Line_1(bitmap,0) );
 // Layout the label for the single line format
 if (aSingleLayout)
 {
-if (!aIsEditable)
+if (aIsEditable)
+{
+// Do nothing; this is the default used
+}
+else
 {
 // This layout is dy
 if (aBitmapPresent)
 {
 TAknTextLineLayout anotherTextLayout(AKN_LAYOUT_TEXT_List_pane_texts__single_graphic_heading__Line_1(0) );
 void CEikCaptionedControl::FormLayoutControlPopfield(
 CAknPopupField* aPopfield, const TRect& aParent, TBool aIsEditable,
 TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent,
 TBool /*aIsFocused*/)
 {
-TRect layoutRect( aParent );
+TRect layoutRect = aParent;
 TAknWindowLineLayout layoutData(AKN_LAYOUT_WINDOW_list_form_pane(aNumberOfLines-1));
 	TAknTextLineLayout labelLayout(AknLayout::Form_data_field_texts_Line_2(0));
 if (!aNumberOfLines)
 return;
 TBool isText = EFalse;
 	if (aPopfield->SelectionMode() == CAknPopupField::EAknPopupFieldLabelMode)
 		{
 		isText = ETrue;
 		}
 if (aSingleLayout)
 {
-layoutData=AKN_LAYOUT_WINDOW_list_form_pane(aNumberOfLines-1);
+if (aIsEditable)
+{
+layoutData=AKN_LAYOUT_WINDOW_list_form_pane(aNumberOfLines-1);
+}
+else
+{
+/*
+popupfields not specified in lists.
+Have to convert aParent to form equivalent and use that layout.
+*/
+ConvertViewRectToEditRect(layoutRect);
+layoutData=AKN_LAYOUT_WINDOW_list_form_pane(aNumberOfLines-1);
+}
 }
 else  // double layout
 {
 TInt newpar = ( aBitmapPresent ? 1 : 0 ) ;
-layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
+if (!aBitmapPresent)
+{
-if ( aBitmapPresent && !aIsEditable )
+if (aIsEditable)
 {
-//move bitmap's width for display second line text
+layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
-TAknWindowLineLayout l = AknLayout::List_pane_elements__single_graphic_heading__Line_1();
+}
-TAknLayoutRect bmpRect;
+else
-TRect tempRect;
+{
-bmpRect.LayoutRect( tempRect, l );
+// have to convert Rect before doing this.
-layoutRect.iTl.iX += bmpRect.Rect().Width();
+ConvertViewRectToEditRect(layoutRect);
-}
+layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
 }
+}
+else //AKN_LAYOUT_WINDOW_list_form_graphic_wide_pane
+{
+if (aIsEditable)
+{
+layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
+}
+else
+{
+// have to convert Rect before doing this.
+ConvertViewRectToEditRect(layoutRect);
+layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
+				//move bitmap's width for display second line text
+		        TAknWindowLineLayout l = AknLayout::List_pane_elements__single_graphic_heading__Line_1();
+		        TAknLayoutRect bmpRect;
+		        TRect tempRect;
+		        bmpRect.LayoutRect( tempRect, l );
+				layoutRect.iTl.iX += bmpRect.Rect().Width();
+}
+}
+};
 	aPopfield->SetFormFieldRect(layoutRect);
 	if (isText)
 		{ // popup field will be same size as text element
 		TAknLayoutText r;
 		r.LayoutText(layoutRect, labelLayout);
-		TRect resultRect( r.TextRect() );
+		TRect resultRect = r.TextRect();
 		aPopfield->SetRect(resultRect);
 		}
 	else
 		{ // popup field will be same size as list_pane
 	    AknLayoutUtils::LayoutControl
 if (error == KErrNone )
 {
 TRAP_IGNORE( AknLayoutUtils::OverrideControlColorL( *aPopfield, EColorLabelText, textColor ) );
 }
 }
 }
 // Password editor
 void CEikCaptionedControl::FormLayoutControlSecretEditor(
 CEikSecretEditor* aSecretEd, const TRect& aParent, TBool aIsEditable,
 // Slider control
 void CEikCaptionedControl::FormLayoutControlSlider(CAknSlider* aSlider, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool /*aBitmapPresent*/)
 {
 if (!aNumberOfLines)
 return;
+if (aSingleLayout)
-TRect parentRect( aParent );
+{
+if (aIsEditable)
-if ( !aSingleLayout )
+{
+aSlider->SetRect(aParent);
+}
+else
+{
+/*
+sliders not specified in lists.
+Have to convert aParent to form equivalent and use that layout.
+*/
+TRect conversionRect(aParent);
+ConvertViewRectToEditRect(conversionRect);
+aSlider->SetRect(conversionRect);
+}
+}
+else
 {
 // Not currently specified, so making temporary alterations here.
-TInt baselineSkip = AKN_LAYOUT_MULTILINE_TEXT_Form_data_field_texts_Line_2(1).BaselineSkip();
+TInt baselineSkip= AKN_LAYOUT_MULTILINE_TEXT_Form_data_field_texts_Line_2(1).BaselineSkip();
+TRect newParentRect(aParent);
-// Only move the rect will cover a part or next dialogline, so decrease height of rect form iTl.
+//Only move the rect will cover a part or next dialogline, so decrease height of rect form iTl.
 if( !aIsEditable )
 	        {
-parentRect.iTl.iX += baselineSkip;
+	        newParentRect.iTl.iX += baselineSkip;
 	        }
+newParentRect.iTl.iY += baselineSkip;
-parentRect.iTl.iY += baselineSkip;
-}
+if (aIsEditable)
+{
-aSlider->SetRect( parentRect );
+aSlider->SetRect(newParentRect);
 }
+else
+{
+TRect conversionRect(newParentRect);
+ConvertViewRectToEditRect(conversionRect);
+aSlider->SetRect(conversionRect);
+}
+}
+// Exteded skin support for sliders coded in slider file: \s60\AvKon\src\Aknslider.cpp
+}
+void CEikCaptionedControl::ConvertViewRectToEditRect(TRect& aRect)
+{
+aRect.Grow(-1,1);
+aRect.iBr.iX--;
+}
+void CEikCaptionedControl::ConvertEditRectToViewRect(TRect& aRect)
+{
+aRect.Shrink(-1,1);
+aRect.iBr.iX++;
+}
 // Standard access method for the form layout from within captioned control
 CEikDialogPage::TFormLayoutSelection CEikCaptionedControl::FormLayout() const
 {
 // There is no undefined style, but initialize to single...
 CEikDialogPage::TFormLayoutSelection ret = CEikDialogPage::ESingle;
 if ( iDialogPage )
-{
 ret = iDialogPage->FormLayout();
-}
-else if (iFlags & EEikFormUseDoubleSpacedFormat) // similar to CEikDialogPage::ConstructFormFromResourceL()
+if (!iDialogPage)
 {
-ret = CEikDialogPage::EDouble;
+if (iFlags & EEikFormUseDoubleSpacedFormat) // similar to CEikDialogPage::ConstructFormFromResourceL()
+ret = CEikDialogPage::EDouble;
 }
 return ret;
 }
 void CEikCaptionedControl::DrawFormSeparator( CWindowGc& gc ) const
 TAknLayoutRect sepLineRect;
 if ( FormLayout() == CEikDialogPage::ESingle )
 {
 sepLineRect.LayoutRect
 (
-Rect(),
+ViewRect(),
 AKN_LAYOUT_WINDOW_List_pane_elements__single_heading__Line_2
 );
 sepLineRect.DrawRect(gc);
-}
+}
+//  else
+//      {
+// Currently no LAF specification for separator in double mode
+//      sepLineRect.LayoutRect
+//          (
+//          ViewRect(),
+//          AKN_LAYOUT_WINDOW_List_pane_elements__double_graphic__Line_??
+//          );
+//      sepLineRect.DrawRect(gc);
+//
+//      }
 }
 void CEikCaptionedControl::DrawClosingLine() const
 {
 if (iHighlightControl)
 iExtension->iEditModeHighlightControlContextPressed->SetParentContext(
 GetDialogControlContext( iDialogPage ) );
 }
 else
 {
+outerRect = ViewRect() ;
+innerRect = outerRect ;
 innerRect.iTl = ViewFrameTopLeftRect( outerRect ).iBr ;
 innerRect.iBr = ViewFrameBottomRightRect( outerRect ).iTl ;
 iExtension->iViewModeHighlightControlContext->SetFrameRects( outerRect, innerRect );
 iExtension->iViewModeHighlightControlContext->SetParentContext(
 GetDialogControlContext( iDialogPage ) );
 }
 void CEikCaptionedControl::DrawAsSkinnedForm( CWindowGc& aGc, const TRect& /*aRect*/ ) const
 {
 MAknsSkinInstance* skin = AknsUtils::SkinInstance() ;
-TRgb textColor( KRgbBlack );
-GetColor( EColorLabelText, textColor );
 if ( !iIsCurrentLine )
 {
-AknListUtils::DrawSeparator( aGc, Rect(), textColor, skin );
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush ) ;
 }
 else // Highlight Skinning.  Requires Frame
 {
-TRect outerRect( Rect() );
-TRect innerRect( outerRect );
 if ( iIsEditable )
 {
-innerRect.iTl = EditFrameTopLeftRect( outerRect ).iBr ;
+TRect innerRect( EditRect() ) ;
-innerRect.iBr = EditFrameBottomRightRect( outerRect ).iTl ;
+innerRect.iTl = EditFrameTopLeftRect( Rect() ).iBr ;
+innerRect.iBr = EditFrameBottomRightRect( Rect() ).iTl ;
 MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
-AknsDrawUtils::Background( skin, parentCc, this, aGc, outerRect ) ;
+AknsDrawUtils::Background( skin, parentCc, this, aGc, Rect() ) ;
-AknListUtils::DrawSeparator( aGc, outerRect, textColor, skin );
+// Set the rectangle(s) for the Frame context
+iExtension->iEditModeHighlightControlContext->SetFrameRects( EditRect(), innerRect ) ;
+iExtension->iEditModeHighlightControlContextPressed->SetFrameRects( EditRect(), innerRect ) ;
-// Set the rectangle(s) for the Frame context
+AknsDrawUtils::DrawFrame( skin, aGc, EditRect(), innerRect,
-iExtension->iEditModeHighlightControlContext->SetFrameRects( outerRect, innerRect ) ;
-iExtension->iEditModeHighlightControlContextPressed->SetFrameRects( outerRect, innerRect ) ;
-AknsDrawUtils::DrawFrame( skin, aGc, outerRect, innerRect,
 PressedDownState() ?
 KAknsIIDQsnFrListPressed : KAknsIIDQsnFrInput, KAknsIIDDefault );
 }
 else // View Mode highlight
 {
 TBool drawOk = EFalse;
-innerRect.iTl = ViewFrameTopLeftRect( outerRect ).iBr;
+if( iExtension->IsHighlightAnimated() ) // Draw animated highlight
-innerRect.iBr = ViewFrameBottomRightRect( outerRect ).iTl ;
+{
+CAknsEffectAnim* anim = iExtension->iAnimation->Animation();
-// The bit around the outside must use the parent's control context
-MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage );
+// TODO: Background is drawn first to prevent white stripes
-AknsDrawUtils::Background( skin, parentCc, this, aGc, outerRect ) ;
+// appearing above and below the highlight. Wasting resources
+// here, you could create animation that is a tad bigger and
-AknListUtils::DrawSeparator( aGc, outerRect, textColor, skin );
+// remove background drawing from here.
+TRect viewRect = ViewRect() ;
-// Draw the animation itself
+TRect innerRect( viewRect ) ;
-if ( iExtension->IsHighlightAnimated()
+innerRect.iTl = ViewFrameTopLeftRect( viewRect ).iBr ;
-&& iExtension->iAnimation->Animation() )
+innerRect.iTl.iX-- ; innerRect.iTl.iY-- ;  // not sure why this adjustment is required here and not above.
-{
+innerRect.iBr = ViewFrameBottomRightRect( viewRect ).iTl ;
-drawOk = iExtension->iAnimation->Animation()->Render( aGc,
-outerRect );
+// The bit around the outside must use the parent's control context
-}
+MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
+AknsDrawUtils::BackgroundBetweenRects( skin, parentCc, this, aGc, Rect() , innerRect ) ;
-if ( !drawOk )
-{
+// Draw the animation itself
+if( anim )
+{
+drawOk = anim->Render( aGc, ViewRect() );
+}
+}
+if( !drawOk )
+{
+// Code for skinning Highlight ( Using AVKON LAF highlight in place of
+// Skins LAF to establish highlight outer rect )
+TRect viewRect = ViewRect() ;
+TRect innerRect( viewRect ) ;
+innerRect.iTl = ViewFrameTopLeftRect( viewRect ).iBr ;
+innerRect.iTl.iX-- ; innerRect.iTl.iY-- ;  // not sure why this adjustment is required here and not above.
+innerRect.iBr = ViewFrameBottomRightRect( viewRect ).iTl ;
+// The bit around the outside must use the parent's control context
+MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
+AknsDrawUtils::BackgroundBetweenRects( skin, parentCc, this, aGc, Rect() , innerRect ) ;
 // Set the rectangle(s) for the Frame context
-iExtension->iViewModeHighlightControlContext->SetFrameRects(
+iExtension->iViewModeHighlightControlContext->SetFrameRects( viewRect, innerRect ) ;
-outerRect, innerRect ) ;
+iExtension->iViewModeHighlightControlContextPressed->SetFrameRects( viewRect, innerRect ) ;
-iExtension->iViewModeHighlightControlContextPressed->
-SetFrameRects( outerRect, innerRect ) ;
-AknsDrawUtils::DrawFrame( skin, aGc, outerRect, innerRect,
+AknsDrawUtils::DrawFrame( skin, aGc, viewRect, innerRect,
-PressedDownState() ? KAknsIIDQsnFrListPressed :
+PressedDownState() ?
-KAknsIIDQsnFrList, KAknsIIDDefault );
+KAknsIIDQsnFrListPressed : KAknsIIDQsnFrList, KAknsIIDDefault );
 }
 }
 }
 // Enable/disable the control line as required.  (Hide first, show if necessary)
 TRect rectElements( layoutRect.Rect() );
 User::LeaveIfError(AknIconUtils::SetSize(aBitmap,
 rectElements.Size() ));
 }
-}
+/*
+if (iIsFormControl)
+{
+if (iIsEditable)
+{
+if (iBitmap && iBitmap->Bitmap())
+{
+AknIconUtils::SetSize(CONST_CAST(CFbsBitmap*, iBitmap->Bitmap()),
+TSize(AKN_LAYOUT_WINDOW_Form_data_field_elements_Line_4.iW,
+AKN_LAYOUT_WINDOW_Form_data_field_elements_Line_4.iH));
+}
+}
+else
+{
+if (iBitmap && iBitmap->Bitmap())
+{
+AknIconUtils::SetSize(CONST_CAST(CFbsBitmap*, iBitmap->Bitmap()),
+TSize(AKN_LAYOUT_WINDOW_List_pane_elements__single_graphic_heading__Line_1.iW,
+AKN_LAYOUT_WINDOW_List_pane_elements__single_graphic_heading__Line_1.iH));
+}
+}
+}
+else
+{
+if (iBitmap && iBitmap->Bitmap())
+{
+AknIconUtils::SetSize(CONST_CAST(CFbsBitmap*, iBitmap->Bitmap()),
+TSize(AKN_LAYOUT_WINDOW_List_pane_elements__single_graphic_heading__Line_1.iW,
+AKN_LAYOUT_WINDOW_List_pane_elements__single_graphic_heading__Line_1.iH));
+}
+}                       */
+}
 // -----------------------------------------------------------------------------
 // CEikCaptionedControl::HandleControlEventL
 // Implementation of MCoeControlObserver observer interface for observing touch button
 else
 SetFocus(aSelected,EDrawNow);
 }
+void CEikCaptionedControl::SetPartiallyVisible( TBool aPVisible )
+{
+iExtension->iPartiallyVisible = aPVisible;
+}
 /*
 * Special Label Class which appends colon to label text
 */
 CEikCapCLabel::CEikCapCLabel() : iIsColonEnabled( EFalse )

branch	RCL_3
changeset 19	aecbbf00d063
parent 17	a1caeb42b3a3
child 20	d48ab3b357f1