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

equal deleted inserted replaced

-:c52421ed5f07
+:a1caeb42b3a3
 #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
 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;
 	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();
 // 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->ViewRect(), KAknsDrawParamRGBOnly );
+iSelf->Rect(), KAknsDrawParamRGBOnly );
 }
 void CEikCapCExtension::SimulatePointerEventToControlL(
 const TPointerEvent& aPointerEvent )
 }
 _AKNTRACE_FUNC_EXIT;
 return drawingSkins;
 }
-EXPORT_C CEikCaptionedControl::CEikCaptionedControl() : iHasAppendedEditIndicator(EFalse)
+EXPORT_C CEikCaptionedControl::CEikCaptionedControl()
 {
 _AKNTRACE_FUNC_ENTER;
 iNumberOfLines = 1 ;  // default starting value
 AKNTASHOOK_ADD( this, "CEikCaptionedControl" );
 _AKNTRACE_FUNC_EXIT;
 iControl->SetFocus( EFalse);
 delete iControl;
 delete iCaptionText;
 delete iCaption;
 delete iTrailer;
-delete iToolTipText ;
 delete iBitmap ;
 delete iHighlightControl ;
 if ( iExtension )
 {
 		delete iExtension->iIdle;
 if (iCapCFlags&EUsesEars)
 {
 size.iWidth+=KCapCEarWidth+KCapCEarSpacing;
 iCaptionWidth+=KCapCEarWidth+KCapCEarSpacing;
 }
-size.iHeight+=2*iVertEdgeSpacing;
+size.iWidth+=iCaptionWidth;
-size.iWidth+=iCaptionWidth+2*iHorzEdgeSpacing;
 if (iCapCFlags&ESeparatorAfter)
 size.iHeight+=KCapCSeparatorAfterSpace;
-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);
 }
 }
 /**
 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() + ( 2 * iVertEdgeSpacing ) ;
+TInt normalEditorHeight = editorFont->HeightInPixels() + editorFont->DescentInPixels();
 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=iHorzEdgeSpacing;
+TInt desiredLeft=0;
 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=iHorzEdgeSpacing;
+TInt desiredRight=0;
 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+iHorzEdgeSpacing))
+if(actualLeft>2*(KCapCCenterSpacing))
 {
-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+(iCapCFlags&EUsesEars ? earWidth : 0);
+trailerRect.iTl.iX+=actualLeft+controlWidth;
 trailerRect.iTl.iY+=KTrailCVertCaptionOffset;
-if(actualRight>2*(iHorzEdgeSpacing+KControlTrailerSpacing))
+if(actualRight>2*(KControlTrailerSpacing))
 {
-if(iCapCFlags&ETrailerAfterEar)
+leftAdjust=KControlTrailerSpacing;
-{
+}
-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+earWidth;
+controlRect.iTl.iX+=actualLeft;
-controlRect.iBr.iX-=(actualRight+earWidth);
+controlRect.iBr.iX-=actualRight;
 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
 if (!focused)
 emphasis=(iCapCFlags&ECurrent? CEikLabel::EPartialEmphasis: CEikLabel::ENoEmphasis);
 iCaption->SetEmphasis(emphasis);
 }
 }
-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)
-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[] =
 {
 {
 _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 )
 {
 _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);
 _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=ViewRect();
+TRect viewRect( Rect() );
 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
 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);
 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+iHorzEdgeSpacing/2,rect.iBr.iY-1);
+TPoint separatorStartPt(rect.iTl.iX,rect.iBr.iY-1);
-TPoint separatorEndPt(separatorStartPt.iX+(iFullWidth-iHorzEdgeSpacing), separatorStartPt.iY);
+TPoint separatorEndPt(separatorStartPt.iX, separatorStartPt.iY);
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 gc.SetPenColor(iEikonEnv->ControlColor(EColorWindowText, *this));
 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 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)
-{
-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);
-_AKNTRACE_FUNC_EXIT;
-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);
-_AKNTRACE_FUNC_EXIT;
-return;
-}
-}
-}
 TBool edwinControl( ControlIsAnEdwin( iControlType ) );
 if ( iIsFormControl )
 {
 if ( !PressedDownState() &&
 {
 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);
 delete iCaptionText; // get rid of old iCaptionText
 iCaptionText=0;
 iCaptionText = aText.AllocL();
 }
-if (iCaption->DrawableWindow() == NULL)
+if (!iCaption->DrawableWindow())
 {
 iCaption->SetContainerWindowL(*this);
 iCaption->CopyControlContextFrom(this);
 }
 /*
 // 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() ;
 }
 EXPORT_C void CEikCaptionedControl::ResetMinimumSizes()
 {
 	_AKNTRACE_FUNC_ENTER;
-iMinSize.iWidth=0;
 iCaptionWidth=0;
-iFullWidth=0;
 _AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TBool CEikCaptionedControl::IsLatent() const
 {
 {
 }
 EXPORT_C const TDesC* CEikCaptionedControl::ToolTipText() const
 {
-if ( iToolTipText )
+return NULL ;
-return  iToolTipText ;
-else
-return NULL ;
 }
 /**
 * Writes the internal state of the control and its components to aStream.
 * Does nothing in release mode.
 			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 )
+MinimumSize() ;
+// if control has no height, return now (no point laying out)
+if (!Rect().Height())
 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 (!Rect().Height())
-return;
 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( parentRect, verticalLine );
+layoutRect.LayoutRect( Rect(), 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 = ViewRect();
+TRect layoutRectOfDataPane( Rect() );
 if ( hasBitmaps )
 {
 if (iBitmap)
 FormLayoutControlBitmap
 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.
 */
 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.
 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;
 }
 	//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);
 	    }
-	TBool isviewmode = !aIsEditable;
+	aEdwin->SetSuppressBackgroundDrawing(!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)
 {
-if (aIsEditable)
+layoutData=AKN_LAYOUT_WINDOW_list_form_pane(aNumberOfLines-1);
-{
-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 ) ;
-if (!aBitmapPresent)
+layoutData=AKN_LAYOUT_WINDOW_list_form_wide_pane(newpar, aNumberOfLines-1);
-{
-if (aIsEditable)
+if ( aBitmapPresent && !aIsEditable )
 {
-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();
-else
+TAknLayoutRect bmpRect;
-{
+TRect tempRect;
-// have to convert Rect before doing this.
+bmpRect.LayoutRect( tempRect, l );
-ConvertViewRectToEditRect(layoutRect);
+layoutRect.iTl.iX += bmpRect.Rect().Width();
-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);
 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 )
 	        {
-	        newParentRect.iTl.iX += baselineSkip;
+parentRect.iTl.iX += baselineSkip;
 	        }
-newParentRect.iTl.iY += baselineSkip;
+parentRect.iTl.iY += baselineSkip;
-if (aIsEditable)
+}
-{
-aSlider->SetRect(newParentRect);
+aSlider->SetRect( parentRect );
 }
-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();
+}
-if (!iDialogPage)
+else if (iFlags & EEikFormUseDoubleSpacedFormat) // similar to CEikDialogPage::ConstructFormFromResourceL()
 {
-if (iFlags & EEikFormUseDoubleSpacedFormat) // similar to CEikDialogPage::ConstructFormFromResourceL()
+ret = CEikDialogPage::EDouble;
-ret = CEikDialogPage::EDouble;
 }
 return ret;
 }
 void CEikCaptionedControl::DrawFormSeparator( CWindowGc& gc ) const
 TAknLayoutRect sepLineRect;
 if ( FormLayout() == CEikDialogPage::ESingle )
 {
 sepLineRect.LayoutRect
 (
-ViewRect(),
+Rect(),
 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 ) );
 AknListUtils::DrawSeparator( aGc, Rect(), textColor, skin );
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush ) ;
 }
 else // Highlight Skinning.  Requires Frame
 {
+TRect outerRect( Rect() );
+TRect innerRect( outerRect );
 if ( iIsEditable )
 {
-TRect innerRect( EditRect() ) ;
+innerRect.iTl = EditFrameTopLeftRect( outerRect ).iBr ;
-innerRect.iTl = EditFrameTopLeftRect( Rect() ).iBr ;
+innerRect.iBr = EditFrameBottomRightRect( outerRect ).iTl ;
-innerRect.iBr = EditFrameBottomRightRect( Rect() ).iTl ;
 MAknsControlContext* parentCc = GetDialogControlContext( iDialogPage ) ;
-AknsDrawUtils::Background( skin, parentCc, this, aGc, Rect() ) ;
+AknsDrawUtils::Background( skin, parentCc, this, aGc, outerRect ) ;
-AknListUtils::DrawSeparator( aGc, Rect(), textColor, skin );
+AknListUtils::DrawSeparator( aGc, outerRect, textColor, skin );
 // Set the rectangle(s) for the Frame context
-iExtension->iEditModeHighlightControlContext->SetFrameRects( EditRect(), innerRect ) ;
+iExtension->iEditModeHighlightControlContext->SetFrameRects( outerRect, innerRect ) ;
-iExtension->iEditModeHighlightControlContextPressed->SetFrameRects( EditRect(), innerRect ) ;
+iExtension->iEditModeHighlightControlContextPressed->SetFrameRects( outerRect, innerRect ) ;
-AknsDrawUtils::DrawFrame( skin, aGc, EditRect(), innerRect,
+AknsDrawUtils::DrawFrame( skin, aGc, outerRect, innerRect,
 PressedDownState() ?
 KAknsIIDQsnFrListPressed : KAknsIIDQsnFrInput, KAknsIIDDefault );
 }
 else // View Mode highlight
 {
 TBool drawOk = EFalse;
-TRect viewRect( ViewRect() );
+innerRect.iTl = ViewFrameTopLeftRect( outerRect ).iBr;
-TRect innerRect( viewRect );
+innerRect.iBr = ViewFrameBottomRightRect( outerRect ).iTl ;
-innerRect.iTl = ViewFrameTopLeftRect( viewRect ).iBr;
-innerRect.iTl.iX-- ; innerRect.iTl.iY--;
-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,
+AknsDrawUtils::Background( skin, parentCc, this, aGc, outerRect ) ;
-Rect(), innerRect );
-AknListUtils::DrawSeparator( aGc, Rect(), textColor, skin );
+AknListUtils::DrawSeparator( aGc, outerRect, textColor, skin );
 // Draw the animation itself
 if ( iExtension->IsHighlightAnimated()
 && iExtension->iAnimation->Animation() )
 {
 drawOk = iExtension->iAnimation->Animation()->Render( aGc,
-viewRect );
+outerRect );
 }
 if ( !drawOk )
 {
 // Set the rectangle(s) for the Frame context
 iExtension->iViewModeHighlightControlContext->SetFrameRects(
-viewRect, innerRect ) ;
+outerRect, innerRect ) ;
 iExtension->iViewModeHighlightControlContextPressed->
-SetFrameRects( viewRect, innerRect ) ;
+SetFrameRects( outerRect, innerRect ) ;
-AknsDrawUtils::DrawFrame( skin, aGc, viewRect, innerRect,
+AknsDrawUtils::DrawFrame( skin, aGc, outerRect, innerRect,
 PressedDownState() ? KAknsIIDQsnFrListPressed :
 KAknsIIDQsnFrList, KAknsIIDDefault );
 }
 }
 }
 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 50	a1caeb42b3a3
parent 29	a8834a2e9a96
child 55	aecbbf00d063