FCL/sf/app/contacts: comparison phonebookui/Phonebook2/UIControls/src/cpbk2contactviewcustomlistboxdata.cpp

equal deleted inserted replaced

-:2666d9724c76
+:d4f567ce2e7c
 #endif // RD_LIST_STRETCH
 iKineticScrolling = CAknPhysics::FeatureEnabled();
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 LoadMarkingIconsL();
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 }
 CPbk2ContactViewCustomListBoxDataExtension::~CPbk2ContactViewCustomListBoxDataExtension()
 {
 // CPbk2ContactViewCustomListBoxDataExtension::SkinChangedL
 // -----------------------------------------------------------------------------
 //
 void CPbk2ContactViewCustomListBoxDataExtension::SkinChangedL()
 {
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 DeleteAnim();
 TryCreateAnimation();
 CreateColorBitmapsL();
 LoadMarkingIconsL();
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 }
 // -----------------------------------------------------------------------------
 // CPbk2ContactViewCustomListBoxDataExtension::SkinChanged
 // -----------------------------------------------------------------------------
 //
 // CPbk2ContactViewCustomListBoxDataExtension::LoadMarkingIconsL
 // -----------------------------------------------------------------------------
 //
 void CPbk2ContactViewCustomListBoxDataExtension::LoadMarkingIconsL()
 {
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 if ( !iMarkingIconArray )
 {
 iMarkingIconArray = new ( ELeave ) CAknIconArray( 2 );
 }
 else
 EMbmAvkonQgn_prop_checkbox_off_mask );
 CleanupStack::PushL( icon );
 iMarkingIconArray->AppendL( icon );
 CleanupStack::Pop( icon );
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 }
 CCoeControl *CPbk2ContactViewCustomListBoxData::Control() const
 {
 return iExtension->iControl;
 TPtrC text;
 TPtrC tempText;
 TRgb aTextColor = aHighlight ? aColors.iHighlightedText : aColors.iText;
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TBool markingMode = EFalse;
 TRect itemRect( aRect );
 if ( listbox->View() && listbox->View()->ItemDrawer() )
 {
 markingMode = ETrue;
 itemRect.iTl.iX +=
 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( 0 ).LayoutLine().il;
 }
 }
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 MAknsSkinInstance *skin = AknsUtils::SkinInstance();
 MAknsControlContext *cc = AknsDrawUtils::ControlContext( Control() );
 if (!cc)
 {
 Mem::FillZ( &rectClipped[0], KMaxColumn * sizeof( TBool ) );
 if ( iExtension->iSubCellsMightIntersect )
 {
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 CheckIfSubCellsIntersectL( &textLines[0], &rectClipped[0], *aText, itemRect );
 }
-#else
-CheckIfSubCellsIntersectL( &textLines[0], &rectClipped[0], *aText, aRect );
-}
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 if ( !listbox || !listbox->BackgroundDrawingSuppressed() )
 {
 AknListUtils::DrawSeparator( aGc, aRect, aColors.iText, skin );
 }
 DrawHighLight( aGc, aRect, aHighlight, skin );
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 if ( markingMode && !aItemProperties.IsSelectionHidden() )
 {
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( aRect,
 AknLayoutScalable_Avkon::list_single_graphic_pane_g1( 0 ) );
 aGc.BitBltMasked( layoutRect.Rect().iTl, bitmap, TRect( layoutRect.Rect().Size() ), icon->Mask(), EFalse );
 }
 }
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 // The column draw loop
 column = 0;
 TInt subCellIndex = 0;
 // Whether need to redraw the PopupCharacter
 default:  break;
 };
 }
 TAknLayoutText textLayout;
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 textLayout.LayoutText( itemRect, textLineLayout, usedFont );
 TRect layoutedRect( itemRect);
-#else
-textLayout.LayoutText( aRect, textLineLayout, usedFont );
-TRect layoutedRect( aRect );
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 // *2 == leave some room for marquee
 const TInt maxlen( KMaxColumnDataLength * 2 );
 TBuf<maxlen> convBuf = text.Left(maxlen);
 if ( iExtension->IsMarqueeOn() && doesNotFit && !marqueeDisabled )
 {
 iExtension->iMarquee->UseLogicalToVisualConversion( bidiConv );
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 if ( iExtension->iMarquee->DrawText( aGc, itemRect, textLineLayout, convBuf, usedFont, textColor ) )
-#else
-if ( iExtension->iMarquee->DrawText( aGc, aRect, textLineLayout, convBuf, usedFont, textColor ) )
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 {
 // all the loops have been executed
 textLayout.DrawText( aGc, convBuf, bidiConv, textColor );
 }
 }
 __ASSERT_DEBUG((index>=0 && index<IconArray()->Count()),Panic(EPanicColumnListInvalidBitmapIndexListBoxData));
 TAknWindowLineLayout graphicLayout = iExtension->AtSL(subCellIndex).iGraphicLayout;
 TAknLayoutRect graphicRect;
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 graphicRect.LayoutRect( itemRect,graphicLayout );
-#else
-graphicRect.LayoutRect(aRect,graphicLayout);
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TSize graphicSize( graphicRect.Rect().Size() );
 if (index>=0 && IconArray())
 {
 CGulIcon* icon=(*IconArray())[index];
 aGc.DiscardFont();
 }
 return;
 }
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
 TBool markingMode = EFalse;
 TRect itemRect( aRect );
 if ( listbox->View() && listbox->View()->ItemDrawer() )
 markingMode = ETrue;
 itemRect.iTl.iX +=
 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( 0 ).LayoutLine().il;
 }
 }
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TInt extraVerticalSpace=(aRect.Height()-font->HeightInPixels());
 TInt baseLineOffset=extraVerticalSpace/2+font->AscentInPixels();
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TRect textRect( itemRect );
 TRect textMRect; // textrect with margins.
 textRect.iBr.iX = itemRect.iTl.iX;
-#else
-TRect textRect( aRect );
-TRect textMRect; // textrect with margins.
-textRect.iBr.iX=aRect.iTl.iX;
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TInt column=0;
 TPtrC text;
 TRgb aTextColor = aHighlight ? aColors.iHighlightedText : aColors.iText;
 // Turned the drawing to multipass algorithm, because optionalcolumns drawing will
 // be too difficult to do without - and this is cleaner solution.
 // pass 1, figures out x-coordinates for columns.
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TInt x = itemRect.iTl.iX;
-#else
-TInt x = aRect.iTl.iX;
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TBool mirror = AknLayoutUtils::LayoutMirrored();
 if (mirror)
 {
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 x = itemRect.iBr.iX;
-#else
-x = aRect.iBr.iX;
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 }
 TInt maxx = x;
 while(column <= lastColumn)
 {
 // order of instructions is important here, do not change.
 if (!cc)
 {
 cc = SkinBackgroundContext();
 }
-#ifndef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
-// aRect is list item's rect, width of which is smaller than width of the list
-// with a scroll bar. List needs to draw under scroll bar anyway, so we need to
-// modify given rect here.
-TRect r(aRect);
-CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
-#endif // !PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 transApi->StopDrawing();
 }
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 }
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 if ( iExtension->iCurrentRow < listbox->BottomItemIndex() )
-#else
-CEikListBox* list = static_cast<CEikListBox*>( iExtension->iControl );
-if ( iExtension->iCurrentRow < list->BottomItemIndex() )
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 {
 AknListUtils::DrawSeparator( aGc, aRect, aColors.iText, skin );
 }
 // LISTBOX LINES NEED TO BE DRAWN HERE.
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 aGc.SetClippingRect( view->ViewRect() );
 }
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 if ( markingMode && !aItemProperties.IsSelectionHidden() )
 {
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect(
 aRect,
 TRect( layoutRect.Rect().Size() ),
 icon->Mask(),
 EFalse );
 }
 }
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 // The column draw loop
 column = 0;
 FOREVER
 {
 {
 // Animation is skin dependent, whenever skin changes animation changes
 // too.
 if( KAknsMessageSkinChange == aType )
 {
-#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 TRAP_IGNORE( iExtension->SkinChangedL() );
-#else
-iExtension->SkinChanged();
-#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES
 }
 else if(aType == KEikDynamicLayoutVariantSwitch)
 {
 // What is under highlight may have changed -> we need to update
 // highlight background to animation.

branch	RCL_3
changeset 58	d4f567ce2e7c
parent 35	4ae315f230bc
child 64	c1e8ba0c2b16