MCL/sf/app/phone: comparison phoneuis/easydialing/src/easydialinglistboxdata.cpp

equal deleted inserted replaced

-:38529f706030
+:544e34b3255a
 // LOCAL FUNCTION PROTOTYPES
 static TRect ContactNameBoundingBox(
 const TRect& aItemRect,
 const CFont* aContactNameFont,
-TBool aIsCurrentItem,
+TBool aArrowIconShown,
 TBool aIsFavourite,
 TBool aThumbnailsShown );
 static TRect CompanyNameBoundingBox(
 const TRect& aItemRect,
 const CFont* aCompanyNameFont,
 TInt& aXOffset,
 const TDesC& aText,
 TBool aMatch,
 const CFont* aFont );
+static CGulIcon* CreateIconL(
+const TDesC& aFileName,
+TInt aBitmapId,
+TInt aMaskId );
 // FORWARD DECLARATIONS
 /*
 * ==============================================================================
 // -----------------------------------------------------------------------------
 // CEasyDialingListBoxData
 //
 // -----------------------------------------------------------------------------
 //
 CEasyDialingListBoxData::CEasyDialingListBoxData() :
 CFormattedCellListBoxData()
 {
 }
 // -----------------------------------------------------------------------------
 // Destructor
 //
 // -----------------------------------------------------------------------------
 //
 CEasyDialingListBoxData::~CEasyDialingListBoxData()
 {
 // Release fonts. ReleaseFont function can cope with null pointer
 // so we don't need to null check them.
 CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() );
 // -----------------------------------------------------------------------------
 // NewL
 //
 // -----------------------------------------------------------------------------
 //
 CEasyDialingListBoxData* CEasyDialingListBoxData::NewL()
 {
 CEasyDialingListBoxData* self = new (ELeave) CEasyDialingListBoxData();
 CleanupStack::PushL( self );
 // -----------------------------------------------------------------------------
 // DrawData
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::DrawData(
 const TListItemProperties& aProperties,
 CWindowGc& aGc,
 const TDesC* aText,
 const TRect& aRect,
 // -----------------------------------------------------------------------------
 // ConstructLD
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::ConstructLD()
 {
 CFormattedCellListBoxData::ConstructLD();
 // EasyDialing bitmap file is attempted to be read from the same directory where the
 Dll::FileName( dllFileName );
 TParse parse;
 User::LeaveIfError(parse.Set(KEasyDialingBitmapFile, &dllFileName, NULL));
 TFileName bitmapFileName(parse.FullName());
-CFbsBitmap* bm;
+// Icon displayed for the selected item in normal layout
-CFbsBitmap* mask;
+iArrowPointingRight = CreateIconL( bitmapFileName, EMbmEasydialingQgn_indi_org_arrow_right,
+EMbmEasydialingQgn_indi_org_arrow_right_mask );
-// iArrowPointingLeft is the icon displayed for the selected item in EasyDialingListBox
-AknIconUtils::CreateIconL( bm, mask, bitmapFileName, EMbmEasydialingQgn_indi_org_arrow_left,
+// Icon displayed for the selected item in mirrored layout
+iArrowPointingLeft = CreateIconL( bitmapFileName, EMbmEasydialingQgn_indi_org_arrow_left,
 EMbmEasydialingQgn_indi_org_arrow_left_mask );
-iArrowPointingLeft = CGulIcon::NewL( bm, mask );
+// Only mask for the arrow icons are used. iColorBitmap is used for making the icon
-AknIconUtils::CreateIconL( bm, mask, bitmapFileName, EMbmEasydialingQgn_indi_org_arrow_right,
-EMbmEasydialingQgn_indi_org_arrow_right_mask );
-iArrowPointingRight = CGulIcon::NewL( bm, mask );
-// Only mask for the icons are used. iColorBitmap is used for making the icon
 // to follow text color changes according to skin.
 iColorBitmap = new (ELeave) CFbsBitmap;
 // Contact default thumbnail is not available in themes. It is read from phonebook resource.
-AknIconUtils::CreateIconL( bm, mask, KPhonebook2EceBitmapFile,
+iDummyThumbnail = CreateIconL( KPhonebook2EceBitmapFile,
 EMbmPhonebook2eceQgn_prop_pb_thumb_unknown, EMbmPhonebook2eceQgn_prop_pb_thumb_unknown_mask );
-iDummyThumbnail = CGulIcon::NewL( bm, mask );
 // Create the favourite icon bitmap and mask
-AknIconUtils::CreateIconL( bm, mask, KFavouriteIconBitmapFile,
+iFavouriteIcon = CreateIconL( KFavouriteIconBitmapFile,
 EMbmPhonebook2Qgn_prop_pb_topc, EMbmPhonebook2Qgn_prop_pb_topc_mask );
-iFavouriteIcon = CGulIcon::NewL( bm, mask );
 }
 // -----------------------------------------------------------------------------
 // DrawHighlight
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::DrawHighlight( CWindowGc &aGc, const TRect &aItemRect ) const
 {
 MAknListBoxTfxInternal* transApi = CAknListLoader::TfxApiInternal( &aGc );
 if ( transApi )
 {
 TInt error = TextUtils::ColumnText( cellText , 0, aText );
 __ASSERT_DEBUG( error == KErrNone, EasyDialingPanic( EEasyDialingPanicInvalidListBoxModelString ) );
 __ASSERT_DEBUG( iContactNameFont, EasyDialingPanic( EEasyDialingNoFontFound ) );
 __ASSERT_DEBUG( iCompanyNameFont, EasyDialingPanic( EEasyDialingNoFontFound ) );
-MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
+MAknListBoxTfxInternal* transApi = CAknListLoader::TfxApiInternal( &aGc );
 if ( transApi )
 {
 transApi->StartDrawing( MAknListBoxTfxInternal::EListItem );
 if ( transApi->EffectsDisabled() )
 {
 if ( AknLayoutUtils::LayoutMirrored() )
 {
 boundingBox = MirrorLayoutBoundingBox( aItemRect, boundingBox );
 }
-//Draws the Contact Thumbnail Icon if exists else draws the dummy contact thumbnail
+// Arrow icon is drawn if the item is in focus and listbox has focus
-TBool fav = ContactThumbnailDrawing( aGc, boundingBox, cellText );
+// (and not only the temporary visual focus caused by touching a list item).
+TBool showArrowIcon = aHighlight && iControl->IsFocused();
+if ( showArrowIcon )
+{
+TRect arrowRect = ArrowIconBoundingBox( aItemRect );
+if ( AknLayoutUtils::LayoutMirrored() )
+{
+arrowRect = MirrorLayoutBoundingBox( aItemRect, arrowRect );
+}
+DrawArrowIcon( aGc, arrowRect );
+}
+//Draws the Contact Thumbnail Icon if exists, else draws the dummy contact thumbnail
+TBool fav = DrawContactThumbnail( aGc, boundingBox, cellText );
 error = TextUtils::ColumnText( cellText , 1, aText );
 __ASSERT_DEBUG( error == KErrNone, EasyDialingPanic( EEasyDialingPanicInvalidListBoxModelString ) );
 boundingBox = ContactNameBoundingBox( aItemRect,
 iContactNameFont,
-aHighlight,
+showArrowIcon,
 fav,
 iContactDataManager->GetContactThumbnailSetting() );
 TRect nameRectUnMirrored = boundingBox; // used for favourite star drawing
 if ( AknLayoutUtils::LayoutMirrored() )
 }
 // favourite icon size is set the same as contact name bounding box height.
 TInt favouriteIconSize = boundingBox.Height();
-TRect arrowRect = ArrowIconBoundingBox( aItemRect );
-if ( AknLayoutUtils::LayoutMirrored() )
-{
-arrowRect = MirrorLayoutBoundingBox( aItemRect, arrowRect );
-}
-// Draw arrow icon if the item is in focus.
-if ( aHighlight )
-{
-DrawArrowIcon( aGc, arrowRect );
-}
 TInt err( KErrNone );
 TRAP( err, DrawTextWithMatchHighlightL(
 boundingBox, aGc, cellText, iContactNameFont, aColors, aHighlight ) );
 if ( !err && TextUtils::ColumnText( cellText , 2, aText ) == KErrNone )
 transApi->StopDrawing();
 }
 }
 // -----------------------------------------------------------------------------
-// ContactThumbnailDrawing
+// DrawContactThumbnail
 //
-// Draws the Contact Thumbnail Icon if any else draws the dummy contact thumbnail
+// Draws the Contact Thumbnail Icon if any, else draws the dummy contact thumbnail
-// -----------------------------------------------------------------------------
+// Also check if this is a favorite contact and return true if this is.
+// -----------------------------------------------------------------------------
-TBool CEasyDialingListBoxData::ContactThumbnailDrawing(CWindowGc& aGc, TRect aBoundingBox, TPtrC aCellText) const
+//
+TBool CEasyDialingListBoxData::DrawContactThumbnail(CWindowGc& aGc, TRect aBoundingBox, TPtrC aCellText) const
 {
 TBool fav(EFalse);
 CFbsBitmap* thumbnail(NULL);
 TBool isLoaded = iContactDataManager->GetThumbnailAndFav(aCellText, thumbnail, fav);
 if ( isLoaded && thumbnail )
 // -----------------------------------------------------------------------------
 // DrawArrowIcon
 //  Draws the Action Menu
 // -----------------------------------------------------------------------------
+//
 void CEasyDialingListBoxData::DrawArrowIcon(
 CWindowGc& aGc, TRect aArrowRect) const
 {
 // Action Menu Arrow for opening the Action Menu
 if ( AknLayoutUtils::LayoutMirrored() )
 // -----------------------------------------------------------------------------
 // DrawFavouriteIcon
 //
 // Draws the Favourite Icon
 // -----------------------------------------------------------------------------
+//
 void CEasyDialingListBoxData::DrawFavouriteIcon(
 CWindowGc& aGc,
 TRect aNameRectUnMirrored,
 TRect aEffectiveRect) const
 {
 }
 // -----------------------------------------------------------------------------
 // SetContactDataManager
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::SetContactDataManager(CEasyDialingContactDataManager* aContactDataManager)
 {
 iContactDataManager = aContactDataManager;
 }
 // -----------------------------------------------------------------------------
 // ObtainFonts
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::ObtainFonts( TInt aItemHeight )
 {
 CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() );
 // Release previous fonts. ReleaseFont function can cope with null pointers
 // -----------------------------------------------------------------------------
 // UpdateColorBitmapL
 // ColorBitmap is redrawn when UI layout or text color (Theme) changes
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::UpdateColorBitmapL( const TSize& aSize )
 {
 TRgb color;
 // Get the HighLighted text color in ListBox from the Theme
 AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), color,
 // -----------------------------------------------------------------------------
 // SetEDLBXControl
 //
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingListBoxData::SetEDLBXControl(CEasyDialingListBox* aControl)
 {
 iControl = aControl;
 }
 // -----------------------------------------------------------------------------
 // ContactImageBoundingBox
 // Calculates the area where contact thumbnail is confined
 // -----------------------------------------------------------------------------
 //
-TRect ContactImageBoundingBox(const TRect& aItemRect)
+TRect ContactImageBoundingBox( const TRect& aItemRect )
 {
 TInt leftMargin = aItemRect.Width() * KMarginXPercent / KCent;
 TInt topMargin = KMarginYPercent * aItemRect.Height() / KCent;
 TInt bottomMargin = topMargin;
 TInt width = ((aItemRect.Height() - topMargin - bottomMargin) * KThumbnailAspectRatio) / KCent;
 // -----------------------------------------------------------------------------
 // ContactNameBoundingBox
 // Calculates the area to which the contact name and possible match highlights
 // are confined.
-//
 // -----------------------------------------------------------------------------
 //
 static TRect ContactNameBoundingBox(
 const TRect& aItemRect,
 const CFont* aContactNameFont,
-TBool aIsCurrentItem,
+TBool aArrowIconShown,
 TBool aIsFavourite,
 TBool aThumbnailsShown )
 {
 // Position X will contain the starting position of text from left side of item rect.
 TInt positionX = aItemRect.Width() * KMarginXPercent / KCent;
 TInt topMargin = KContactNameYOffsetPercent * aItemRect.Height() / KCent;
 TInt height = KTextBoundingBoxHeightPercent * aContactNameFont->FontMaxHeight() / KCent;
 TInt rightMargin = KMarginXPercent * aItemRect.Width() / KCent;
-// Reserve space for communication launcher icon.
+// Reserve space for communication launcher icon if it's shown on this item
-// Communication launcher icon is shown only id item is highlighted.
+if ( aArrowIconShown )
-if ( aIsCurrentItem )
 {
 rightMargin += KArrowIconSizePercent * aItemRect.Height() / KCent;
 }
 // If item is favourite, reserve space for favourite icon. Icon dimensions are the same as bounding box height.
 // -----------------------------------------------------------------------------
 // ArrowIconBoundingBox
 // Calculates the area to which the action menu icon is drawn.
 // -----------------------------------------------------------------------------
 //
-TRect ArrowIconBoundingBox(const TRect& aItemRect)
+TRect ArrowIconBoundingBox( const TRect& aItemRect )
 {
 TInt iconSize = KArrowIconSizePercent * aItemRect.Height() / KCent;
 TInt rightMargin = KMarginXPercent * aItemRect.Width() / KCent;
 TInt positionX = aItemRect.iBr.iX - rightMargin - iconSize;
 TInt topMargin = ( aItemRect.Height() - iconSize ) / 2; // Icon is vertically centered.
 // -----------------------------------------------------------------------------
 // MirrorLayoutBoundingBox
 //
 // -----------------------------------------------------------------------------
 //
-static TRect MirrorLayoutBoundingBox(const TRect& aSourceRect, TRect& aBoundingBoxRect)
+static TRect MirrorLayoutBoundingBox( const TRect& aSourceRect, TRect& aBoundingBoxRect )
 {
 return TRect(
 aSourceRect.iTl.iX + aSourceRect.iBr.iX - aBoundingBoxRect.iBr.iX,
 aBoundingBoxRect.iTl.iY,
 aSourceRect.iTl.iX + aSourceRect.iBr.iX - aBoundingBoxRect.iTl.iX,
 // width for matching highlight.
 // NOTE 2: This function cannot handle right-to-left or bidirectional text currently.
 // These cases must be handled elsewhere.
 // -----------------------------------------------------------------------------
 //
-_LIT( KThreeDots, "..." );
 static void ClipTextToWidth(
 TDes& aText,
 const CFont& aFont,
 TInt aMaxWidthInPixels,
 TBool& aMatch)
 {
+_LIT( KThreeDots, "..." );
 TInt minimumWidth = aFont.TextWidthInPixels( KThreeDots );
 // If this is a matching piece of text, also match text marginals need to be counted.
 if ( aMatch )
 {
 aMaxWidthInPixels -= 2 * KMatchingTextMarginInPixels;
 }
 AknTextUtils::ClipToFit( aText, aFont, aMaxWidthInPixels );
 }
 // -----------------------------------------------------------------------------
 // DrawPieceOfText
 // Draws a piece of text of contact, either matching or not matching.
 // Updates aXOffset argument by adding drawn text width.
 delete newText;
 aXOffset += wholeWidth;
 return ETrue;
 }
 // -----------------------------------------------------------------------------
 // DrawTextWithMatchHighlight
 // Draws a string with match highlight. Highlighted and non-highlighted
 // parts are separated with KHighlightSeparatorChar.
 // The first text part is not highlighted and from that on highlight
 const TRect& aBoundingBox,
 CWindowGc &aGc,
 const TDesC& aText,
 const CFont* aFont,
 const CEasyDialingListBoxData::TExtendedColors& aColors,
-TBool aHighLight)
+TBool aHighLight )
 {
 TInt xOffset = 0;
 HBufC* visualBuf = ConvertToVisualAndClipLC( aText, *aFont, aBoundingBox );
 // -----------------------------------------------------------------------------
 // CalculateTextWidth
 // Calculates the width of the text and returns it
 // -----------------------------------------------------------------------------
 //
-static TInt CalculateTextWidth(const TRect& aBoundingBox, const TDesC& aText, const CFont* aFont )
+static TInt CalculateTextWidth( const TRect& aBoundingBox,
-{
+const TDesC& aText,
+const CFont* aFont )
+{
 TInt xOffset = 0;
 TPtrC textPiece;
 TInt textPieceIndex = 0;
 TBool match = EFalse;
 // NOTE2: It's assumed that there can be highlights only in pure LTR and RTL
 // texts. Highlights for mixed LTR-RTL text cannot be handled properly.
 // -----------------------------------------------------------------------------
 //
 static HBufC* ConvertToVisualAndClipLC( const TDesC& aText,
 const CFont& aFont,
 const TRect& aBoundingBox )
 {
 HBufC* buf = HBufC::NewLC( aText.Length() + KAknBidiExtraSpacePerLine );
 TPtr ptr = buf->Des();
 ptr.Copy( aText );
 }
 return sepCount;
 }
+// -----------------------------------------------------------------------------
+// CreateIconL
+//
+// Create and return a new icon object from given file and with given ID
+// -----------------------------------------------------------------------------
+//
+static CGulIcon* CreateIconL(
+const TDesC& aFileName,
+TInt aBitmapId,
+TInt aMaskId )
+{
+CGulIcon* icon = CGulIcon::NewLC();
+CFbsBitmap* bm;
+CFbsBitmap* mask;
+AknIconUtils::CreateIconL( bm, mask, aFileName, aBitmapId, aMaskId );
+icon->SetBitmap( bm );
+icon->SetMask( mask );
+CleanupStack::Pop( icon );
+return icon;
+}
 //  End of File.

branch	RCL_3
changeset 7	544e34b3255a
parent 6	38529f706030
child 14	b8d67d6176f5