diff -r 2666d9724c76 -r d4f567ce2e7c phonebookui/Phonebook2/UIControls/src/cpbk2contactviewcustomlistboxitemdrawer.cpp --- a/phonebookui/Phonebook2/UIControls/src/cpbk2contactviewcustomlistboxitemdrawer.cpp Thu Jul 15 18:22:55 2010 +0300 +++ b/phonebookui/Phonebook2/UIControls/src/cpbk2contactviewcustomlistboxitemdrawer.cpp Thu Aug 19 09:41:07 2010 +0300 @@ -148,19 +148,6 @@ data->SetItemCellSize( iItemCellSize ); } -#ifndef RD_TOUCH2 -void CPbk2ContactViewCustomListBoxItemDrawer::DrawCurrentItemRect(const TRect& aRect) const -// -// Draw the item background -// - { - iGc->SetClippingRect(iViewRect); - iGc->SetBrushStyle(CGraphicsContext::ENullBrush); - iGc->SetPenColor(iHighlightedBackColor); // KDefaultLbxHighlightRectColor - iGc->DrawRect(aRect); - iGc->CancelClippingRect(); - } -#endif // !RD_TOUCH2 /** * Returns a pointer to the column data. Does not imply transfer of ownership. @@ -210,13 +197,11 @@ TInt pos = -1; TBool removeicon = (!aItemIsSelected && !ItemMarkReverse()) || (aItemIsSelected && ItemMarkReverse()); -#ifdef PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES if ( Flags() & CListItemDrawer::EMarkingModeEnabled ) { removeicon = EFalse; } -#endif // PBK2_AVKON_TOUCH_MARKINGMODE_CHANGES if ( Flags() & EDrawMarkSelection && ItemMarkPosition() != -1 && removeicon) { repl.Set( ItemMarkReplacement() ); @@ -309,7 +294,18 @@ TListItemProperties CPbk2ContactViewCustomListBoxItemDrawer::Properties(TInt aItemIndex) const { - if (!iPropertyArray) return CTextListItemDrawer::Properties(aItemIndex); + if ( !iPropertyArray ) + { + TListItemProperties prop( + CTextListItemDrawer::Properties( aItemIndex ) ); + // Do not allow marking other than contact items + if ( !ColumnData()->IsContactAtListboxIndex( aItemIndex ) ) + { + prop.SetHiddenSelection( ETrue ); + } + return prop; + } + CAknListBoxFilterItems *filter = STATIC_CAST(CAknFilteredTextListBoxModel*,iModel)->Filter(); if (filter) {