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

equal deleted inserted replaced

-:2f259fa3e83a
+:8ca85d2f0db7
 #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 ;
 iFeedback( MTouchFeedback::Instance() ),
 	iIdle(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 )
 * 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() : 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);
 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();
 iMinSize=size;
 if ( iDoNotDisplay )
 // This flag is set if the control is not to be shown - so set it's height to zero
 iMinSize.iHeight = 0 ;
+_AKNTRACE_FUNC_EXIT;
 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()
 {
 }
 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::ScrollBackEditor()
 {
+_AKNTRACE_FUNC_ENTER;
 //
 		// For long single-line edwin, scroll horizontally to show beginning of the edwin
 		// when focus changes away from the edwin.
 		//
 	if ( iIsEditable && ControlIsAnEdwin(iControlType) )
 			iExtension->iIdleData->iCtrl = this;
 			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() )
 }
 if (aDrawNow && iCapCFlags&EUsesEars && IsReadyToDraw())
 DrawEarsNow(EBothEars);
+_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawEarsNow(TWhichEars aEar) const
 {
+_AKNTRACE_FUNC_ENTER;
 ActivateGc();
 DrawEars(aEar);
 DeactivateGc();
+_AKNTRACE_FUNC_EXIT;
 }
 void CEikCaptionedControl::DrawEars(TWhichEars aEar) const
 {
 if (aEar&ELeftEar)
 }
 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 )
 {
 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.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 )
 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 )
 //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
 }
 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);
 gc.DrawLine(separatorStartPt, separatorEndPt);
 };
 if (iCapCFlags&EUsesEars)
 DrawEars(EBothEars);
+_AKNTRACE_FUNC_EXIT;
 }
 /*
 * 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())
 {
 TWhichEars ear=ENoEar;
 if (aPointerEvent.iType!=TPointerEvent::EButton1Down)
 {
+_AKNTRACE("TPointerEvent::EButton1Down");
 if (iCapCFlags&ELeftEarGrab)
 ear=ELeftEar;
 else if (iCapCFlags&ERightEarGrab)
 ear=ERightEar;
 if (ear)
 return;
 }
 }
 if (oldDrawFlags!=(iCapCFlags&(ELeftEarDown|ERightEarDown)))
 DrawEarsNow(ear);
+_AKNTRACE_FUNC_EXIT;
 return;
 }
 }
 else if (iCapCFlags&EUsesEars)
 {
 else if (EarRect(ERightEar).Contains(aPointerEvent.iPosition))
 ear=ERightEar;
 if (ear)
 {
 FireEarL(ear, KCapCInitialEarRepeat);
+_AKNTRACE_FUNC_EXIT;
 return;
 }
 }
 }
 if (iIsFormControl)
 SetPressedDownState( ETrue );
 DrawDeferred();
 }
 else if(aPointerEvent.iType == TPointerEvent::EButton1Up)
 {
+_AKNTRACE("TPointerEvent::EButton1Up");
 SetPressedDownState( EFalse );
 DrawDeferred();
 }
 }
 if ( !iIsEditable && (ControlIsAnEdwin(iControlType) || ControlIsAMfne(iControlType))
 &&( iDialogPage && CEikDialogPage::EDouble == iDialogPage->FormLayout() ))
 {
+_AKNTRACE_FUNC_EXIT;
 		return;
 }
 CCoeControl::HandlePointerEventL(aPointerEvent);
 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;
 */
 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();
 {
 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;
 iFullWidth=0;
+_AKNTRACE_FUNC_EXIT;
 }
 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 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 ;
 * Avkon component positioning for Forms
 */
 void CEikCaptionedControl::PositionFormComponents()
 {
+_AKNTRACE_FUNC_ENTER;
 if( iExtension->iPartiallyVisible )
 return;
 TBool isFocused = iIsCurrentLine;
 TBool isSingleLineLayout = ( FormLayout() == CEikDialogPage::ESingle);
 MinimumSize() ;
 default:
 Panic(EEikFormPanicLayoutErrorUnknownControlType);
 }
 TRAP_IGNORE( SetElementTextColorsL(TRgb()));
+_AKNTRACE_FUNC_EXIT;
 }
 TBool CEikCaptionedControl::ShowBitmap() const
 {
 return (iFlags & EEikFormShowBitmaps);
 /**
 * 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 ;
 case EEikCtNumberEditor:
 case EAknCtLocationEditor:
 case EAknCtUnitEditor:
 return ETrue;
 }
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (iDialogPage)
-if (typeOfControlToLayout==MEikDialogPageObserver::EMfneDerived)
+{
-return ETrue;
+	    TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (typeOfControlToLayout==MEikDialogPageObserver::EMfneDerived)
+return ETrue;
+}
 return EFalse;
 }
 TBool CEikCaptionedControl::ControlIsAPopfield(TInt aControlType) const
 {
 {
 case EEikCtSecretEd:
 case EAknCtNumericSecretEditor:
 return ETrue;
 }
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (iDialogPage)
-if (typeOfControlToLayout==MEikDialogPageObserver::ESecretEditorDerived)
+{
-return ETrue;
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (typeOfControlToLayout==MEikDialogPageObserver::ESecretEditorDerived)
+return ETrue;
+}
 return EFalse;
 }
 TBool CEikCaptionedControl::ControlIsASlider(TInt aControlType) const
 {
 switch (aControlType)
 {
 case EAknCtSlider :
 return ETrue;
 }
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (iDialogPage)
-if (typeOfControlToLayout==MEikDialogPageObserver::ESliderDerived)
+{
-return ETrue;
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (typeOfControlToLayout==MEikDialogPageObserver::ESliderDerived)
+return ETrue;
+}
 return EFalse;
 }
 //------------------------------------------------------------------------
 // CEikCaptionedControl::ControlIsAColourSelGrid
 case EAknCtColourSelectionDialogGrid :   // Deprecated
 case EAknCtColourSelectionGridDialog :
 case EAknCtColourSelectionDialogNoneField:
 return ETrue;
 }
-TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (iDialogPage)
-if (typeOfControlToLayout==MEikDialogPageObserver::EColourSelectionGridDerived)
+{
-return ETrue;
+TInt typeOfControlToLayout=iDialogPage->PageContainer()->PageSelector()->Dialg()->ConvertCustomControlTypeToBaseControlType(iControlType);
+if (typeOfControlToLayout==MEikDialogPageObserver::EColourSelectionGridDerived)
+return ETrue;
+}
 return EFalse;
 }
 void CEikCaptionedControl::DoFormCaptionSettingsL(const TDesC& aText)
 {
 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
 }
 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 );
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush ) ;
 }
 else // Highlight Skinning.  Requires Frame
 {
 if ( iIsEditable )
 innerRect.iBr = EditFrameBottomRightRect( Rect() ).iTl ;
 MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
 AknsDrawUtils::Background( skin, parentCc, this, aGc, Rect() ) ;
+AknListUtils::DrawSeparator( aGc, Rect(), textColor );
 // Set the rectangle(s) for the Frame context
 iExtension->iEditModeHighlightControlContext->SetFrameRects( EditRect(), innerRect ) ;
 iExtension->iEditModeHighlightControlContextPressed->SetFrameRects( EditRect(), innerRect ) ;
 AknsDrawUtils::DrawFrame( skin, aGc, EditRect(), innerRect,
 KAknsIIDQsnFrListPressed : KAknsIIDQsnFrInput, KAknsIIDDefault );
 }
 else // View Mode highlight
 {
 TBool drawOk = EFalse;
-if( iExtension->IsHighlightAnimated() ) // Draw animated highlight
+TRect viewRect( ViewRect() );
-{
+TRect innerRect( viewRect );
-CAknsEffectAnim* anim = iExtension->iAnimation->Animation();
+innerRect.iTl = ViewFrameTopLeftRect( viewRect ).iBr;
+innerRect.iTl.iX-- ; innerRect.iTl.iY--;
-// TODO: Background is drawn first to prevent white stripes
+innerRect.iBr = ViewFrameBottomRightRect( viewRect ).iTl ;
-// appearing above and below the highlight. Wasting resources
-// here, you could create animation that is a tad bigger and
+// The bit around the outside must use the parent's control context
-// remove background drawing from here.
+MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage );
-TRect viewRect = ViewRect() ;
+AknsDrawUtils::BackgroundBetweenRects( skin, parentCc, this, aGc,
-TRect innerRect( viewRect ) ;
+Rect(), innerRect );
-innerRect.iTl = ViewFrameTopLeftRect( viewRect ).iBr ;
-innerRect.iTl.iX-- ; innerRect.iTl.iY-- ;  // not sure why this adjustment is required here and not above.
+AknListUtils::DrawSeparator( aGc, Rect(), textColor );
-innerRect.iBr = ViewFrameBottomRightRect( viewRect ).iTl ;
+// Draw the animation itself
-// The bit around the outside must use the parent's control context
+if ( iExtension->IsHighlightAnimated()
-MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
+&& iExtension->iAnimation->Animation() )
-AknsDrawUtils::BackgroundBetweenRects( skin, parentCc, this, aGc, Rect() , innerRect ) ;
+{
+drawOk = iExtension->iAnimation->Animation()->Render( aGc,
-// Draw the animation itself
+viewRect );
-if( anim )
+}
-{
-drawOk = anim->Render( aGc, ViewRect() );
+if ( !drawOk )
-}
+{
-}
-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( viewRect, innerRect ) ;
+iExtension->iViewModeHighlightControlContext->SetFrameRects(
-iExtension->iViewModeHighlightControlContextPressed->SetFrameRects( viewRect, innerRect ) ;
+viewRect, innerRect ) ;
+iExtension->iViewModeHighlightControlContextPressed->
+SetFrameRects( viewRect, innerRect ) ;
 AknsDrawUtils::DrawFrame( skin, aGc, viewRect, innerRect,
-PressedDownState() ?
+PressedDownState() ? KAknsIIDQsnFrListPressed :
-KAknsIIDQsnFrListPressed : KAknsIIDQsnFrList, KAknsIIDDefault );
+KAknsIIDQsnFrList, KAknsIIDDefault );
 }
 }
 }
 // Enable/disable the control line as required.  (Hide first, show if necessary)

branch	RCL_3
changeset 4	8ca85d2f0db7
parent 0	2f259fa3e83a
child 10	9f56a4e1b8ab