equal
deleted
inserted
replaced
2617 } |
2617 } |
2618 CListBoxView* view = listbox->View(); |
2618 CListBoxView* view = listbox->View(); |
2619 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
2619 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
2620 if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) |
2620 if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) |
2621 { |
2621 { |
2622 if ( iExtension->iTextColor != NULL ) |
2622 if (iExtension->iTextColor != NULL) |
2623 { |
2623 { |
2624 aGc.SetPenColor(iExtension->iTextColor); |
2624 aGc.SetPenColor(iExtension->iTextColor); |
2625 } |
2625 } |
2626 if ( aHighlight && iExtension->iHighlightedTextColor != NULL ) |
2626 |
|
2627 if (aHighlight && iExtension->iHighlightedTextColor != NULL) |
2627 { |
2628 { |
2628 aGc.SetPenColor(iExtension->iHighlightedTextColor); |
2629 aGc.SetPenColor(iExtension->iHighlightedTextColor); |
2629 } |
2630 } |
2630 } |
2631 } |
2631 |
2632 |
2838 { |
2839 { |
2839 if ( listbox->View()->ItemDrawer()->Flags() |
2840 if ( listbox->View()->ItemDrawer()->Flags() |
2840 & CListItemDrawer::EMarkingModeEnabled && |
2841 & CListItemDrawer::EMarkingModeEnabled && |
2841 !aProperties.IsSelectionHidden() && |
2842 !aProperties.IsSelectionHidden() && |
2842 iExtension->iMarkingIconArray && |
2843 iExtension->iMarkingIconArray && |
|
2844 #ifdef RD_TOUCH2_MARKING |
2843 iExtension->iMarkingIconArray->Count() == |
2845 iExtension->iMarkingIconArray->Count() == |
2844 KMarkingModeIconArraySize ) |
2846 KMarkingModeIconArraySize ) |
|
2847 #else |
|
2848 iExtension->iMarkingIconArray->Count() == 2 ) |
|
2849 #endif // RD_TOUCH2_MARKING |
2845 { |
2850 { |
2846 if ( AknLayoutUtils::LayoutMirrored() ) |
2851 if ( AknLayoutUtils::LayoutMirrored() ) |
2847 { |
2852 { |
2848 textRect.iBr.iX -= |
2853 textRect.iBr.iX -= |
2849 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( |
2854 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( |