MCL/sf/app/commonemail: comparison emailuis/emailui/src/ncspopuplistbox.cpp

equal deleted inserted replaced

-:e7aa27f58ae1
+:e1b6206813b4
 // -----------------------------------------------------------------------------
 // CNcsPopupListBox::ReturnCurrentEmailAddressLC
 // -----------------------------------------------------------------------------
 //
 CNcsEmailAddressObject* CNcsPopupListBox::ReturnCurrentEmailAddressLC()
-	{
+{
 FUNC_LOG;
-	CNcsEmailAddressObject* addressObject = NULL;
+CNcsEmailAddressObject* addressObject = NULL;
 if ( iMatchingItems.Count() )
-		{
+{
-		CFSEmailUiClsItem* clsItem = NULL;
+CFSEmailUiClsItem* clsItem = NULL;
-		if ( iRemoteLookupSupported )
+if ( iRemoteLookupSupported )
-			{
+{
-			clsItem = iMatchingItems[CurrentItemIndex()-1];  // -1 because of iRemoteLookupItemPos
+// calculate index of item
-			}
+TInt index = (CurrentItemIndex() > iRemoteLookupItemPos ? CurrentItemIndex() - 1 : CurrentItemIndex());
-		else
+clsItem = iMatchingItems[index];
-			{
+}
-			clsItem = iMatchingItems[CurrentItemIndex()]; // no iRemoteLookupItemPos
+else
-			}
+{
-		addressObject= CNcsEmailAddressObject::NewL( clsItem->DisplayName(), clsItem->EmailAddress() );
+clsItem = iMatchingItems[CurrentItemIndex()]; // no iRemoteLookupItemPos
-CleanupStack::PushL( addressObject );
+}
+addressObject= CNcsEmailAddressObject::NewL( clsItem->DisplayName(), clsItem->EmailAddress() );
+CleanupStack::PushL( addressObject );
 if ( clsItem->MultipleEmails() )
-	{
+{
+addressObject->SetDisplayFull( ETrue );
-	addressObject->SetDisplayFull( ETrue );
+}
-	}
+}
-}
+return addressObject;
-	return addressObject;
+}
-	}
 // -----------------------------------------------------------------------------
 // CNcsPopupListBox::SetPopupMaxRect
 // -----------------------------------------------------------------------------
 void CNcsPopupListBox::SetPopupMaxRect( const TRect& aPopupMaxRect )
 			newRMLUItemIndex = iRemoteLookupItemPos + 1;
 			newCurrentItem = CurrentItemIndex() + 1;
 			}
-		if( ItemExists ( newCurrentItem ) )
+		if( ItemExists ( newCurrentItem ) && newRMLUItemIndex != -1 )
 			{
 			iItemTextsArray->Delete( iRemoteLookupItemPos );
 			HBufC* rmluText = StringLoader::LoadLC( R_FSE_EDITOR_ADDRESS_LIST_REMOTE_LOOKUP_SEARCH, *iCurrentSearchText );
 	iGc->SetPenColor(iBackColor);
 	iGc->SetPenStyle(CGraphicsContext::ESolidPen);
 	iGc->SetBrushColor(iBackColor);
 	iGc->SetBrushStyle(CGraphicsContext::ESolidBrush);
+// draw the background
+	TRect backgroundRect( aActualItemRect );
+if ( !aItemIndex )
+{
+backgroundRect.iTl.iY = 0;
+}
+else if ( aItemIndex == iListBox.Model()->NumberOfItems() - 1 )
+{
+backgroundRect.iBr.iY = iListBox.Size().iHeight;
+}
+iGc->DrawRect( backgroundRect );
+TRect textRect( aActualItemRect );
+{
+// temporary const_cast to get scroll width
+CNcsPopupListBox& tmpListBox = const_cast<CNcsPopupListBox&>(iListBox);
+textRect.Resize( -tmpListBox.ScrollBarFrame()->ScrollBarBreadth(CEikScrollBar::EVertical), 0 );
+}
 	// Now draw the highlight
 	if( aItemIsCurrent )
 		{
 		TRgb highlightColor = iListBox.LayoutHandler().PcsPopupHighlightColor();
 		iGc->SetBrushColor(highlightColor);
 //	    AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(), *iGc,
 //	    	aActualItemRect, aActualItemRect,
 //	    	KNcsIIDHighlightBackground, KNcsIIDHighlightBackground );
-		}
+iGc->DrawRect(textRect);
-	iGc->DrawRect(aActualItemRect);
+		}
 	iGc->SetPenColor(iTextColor);
 	iGc->SetPenStyle(CGraphicsContext::ESolidPen);
 	iGc->SetBrushStyle(CGraphicsContext::ENullBrush);
-	TInt topToBaseline = ( aActualItemRect.Height() - font->HeightInPixels() ) / 2
+	TInt topToBaseline = ( textRect.Height() - font->HeightInPixels() ) / 2
 						+ font->AscentInPixels();
 	TPtrC itemText = iListBox.Model()->ItemText( aItemIndex );
 	// Construct bidirectional text object
 	// <cmail> Removed leave from non-leaving function.
 	TBidiText* bidiText = NULL;
 	TRAPD( err, bidiText = TBidiText::NewL( itemText, 1 ) );
 	if ( err == KErrNone )
 		{
-		bidiText->WrapText( aActualItemRect.Width(), *font, NULL );
+		bidiText->WrapText( textRect.Width(), *font, NULL );
 		}
-	TPoint leftBase = aActualItemRect.iTl + TPoint( 0, topToBaseline );
+	TPoint leftBase = textRect.iTl + TPoint( 0, topToBaseline );
 if ( err != KErrNone )
 {
 bidiText = NULL; // to be on the safe side
 }
 		bidiText->DrawText( *iGc, leftBase );
 		}
 	else
 		{
 		// if list has rmlu item change item index right
-		if ( rmluPosition >= 0 )
+		if ( rmluPosition >= 0 && aItemIndex > rmluPosition )
 			{
 			aItemIndex--;
 			}
 		// change color to gray if match doesn't have email address.
 				{
 				if ( currentTextStart < underlines[i].index )
 					{
 					// draw letters to the start of the underlined part
 					currentTextLength = underlines[i].index - currentTextStart;
-					DrawPartOfItem( aActualItemRect, *font, currentTextStart, currentTextLength, itemText,
+					DrawPartOfItem( textRect, *font, currentTextStart, currentTextLength, itemText,
 									EFalse, topToBaseline );
 					}
 				else if ( currentTextStart == underlines[i].index )
 					{
 					// draw underlined letters
 					currentTextLength = underlines[i].length;
-					DrawPartOfItem( aActualItemRect, *font, currentTextStart, currentTextLength, itemText,
+					DrawPartOfItem( textRect, *font, currentTextStart, currentTextLength, itemText,
 									ETrue, topToBaseline );
 					i++;
 					}
 				else
 					{
 					partsLeft = EFalse;
 					// draw rest of the letters, if there are any after the last underlined part
 					if ( currentTextStart < itemText.Length() )
 						{
 						currentTextLength = itemText.Length() - currentTextStart;
-						DrawPartOfItem( aActualItemRect, *font, currentTextStart, currentTextLength, itemText,
+						DrawPartOfItem( textRect, *font, currentTextStart, currentTextLength, itemText,
 										EFalse, topToBaseline );
 						}
 					}
 				}
 iHeaderContainer.ClosePopupContactListL();
 }
 else
 {
 MakeVisible( ETrue );
+UpdateScrollBarsL();
 iHeaderContainer.ShowPopupMenuBarL( ETrue );
 }
 }
 // End of File

branch	RCL_3
changeset 8	e1b6206813b4
parent 2	5253a20d2a1e
child 10	f5907b1a1053