equal
deleted
inserted
replaced
2125 textColor = aColors.iHighlightedText; |
2125 textColor = aColors.iHighlightedText; |
2126 aGc.SetBrushColor(aColors.iHighlightedBack); |
2126 aGc.SetBrushColor(aColors.iHighlightedBack); |
2127 } |
2127 } |
2128 if ( AknsUtils::AvkonSkinEnabled() ) |
2128 if ( AknsUtils::AvkonSkinEnabled() ) |
2129 { |
2129 { |
2130 if ( iExtension->iTextColor != NULL ) |
2130 CListBoxView* view = listbox->View(); |
2131 { |
2131 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
2132 textColor = iExtension->iTextColor; |
2132 if ( !useOverrideColor ) |
2133 } |
2133 { |
2134 |
2134 if ( iExtension->iTextColor != NULL ) |
2135 if ( aHighlight && iExtension->iHighlightedTextColor != NULL ) |
2135 { |
2136 { |
2136 textColor = iExtension->iTextColor; |
2137 textColor = iExtension->iHighlightedTextColor; |
2137 } |
2138 } |
2138 if ( aHighlight && iExtension->iHighlightedTextColor != NULL ) |
|
2139 { |
|
2140 textColor = iExtension->iHighlightedTextColor; |
|
2141 } |
|
2142 } |
2139 } |
2143 } |
2140 |
2144 |
2141 const CFont* rowAndColFont=RowAndColumnFont(iExtension->iCurrentRow,column); |
2145 const CFont* rowAndColFont=RowAndColumnFont(iExtension->iCurrentRow,column); |
2142 const CFont* colFont=Font(aItemProperties, column); |
2146 const CFont* colFont=Font(aItemProperties, column); |
2143 const CFont* tempFont=(colFont) ? colFont : NULL; |
2147 const CFont* tempFont=(colFont) ? colFont : NULL; |
2609 if (aHighlight) |
2613 if (aHighlight) |
2610 { |
2614 { |
2611 aGc.SetPenColor(aColors.iHighlightedText); |
2615 aGc.SetPenColor(aColors.iHighlightedText); |
2612 aGc.SetBrushColor(aColors.iHighlightedBack); |
2616 aGc.SetBrushColor(aColors.iHighlightedBack); |
2613 } |
2617 } |
2614 |
2618 CListBoxView* view = listbox->View(); |
2615 if ( AknsUtils::AvkonSkinEnabled() ) |
2619 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
|
2620 if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) |
2616 { |
2621 { |
2617 if (iExtension->iTextColor != NULL) |
2622 if ( iExtension->iTextColor != NULL ) |
2618 { |
2623 { |
2619 aGc.SetPenColor(iExtension->iTextColor); |
2624 aGc.SetPenColor(iExtension->iTextColor); |
2620 } |
2625 } |
2621 |
2626 if ( aHighlight && iExtension->iHighlightedTextColor != NULL ) |
2622 if (aHighlight && iExtension->iHighlightedTextColor != NULL) |
|
2623 { |
2627 { |
2624 aGc.SetPenColor(iExtension->iHighlightedTextColor); |
2628 aGc.SetPenColor(iExtension->iHighlightedTextColor); |
2625 } |
2629 } |
2626 } |
2630 } |
2627 |
2631 |
2834 { |
2838 { |
2835 if ( listbox->View()->ItemDrawer()->Flags() |
2839 if ( listbox->View()->ItemDrawer()->Flags() |
2836 & CListItemDrawer::EMarkingModeEnabled && |
2840 & CListItemDrawer::EMarkingModeEnabled && |
2837 !aProperties.IsSelectionHidden() && |
2841 !aProperties.IsSelectionHidden() && |
2838 iExtension->iMarkingIconArray && |
2842 iExtension->iMarkingIconArray && |
2839 #ifdef RD_TOUCH2_MARKING |
|
2840 iExtension->iMarkingIconArray->Count() == |
2843 iExtension->iMarkingIconArray->Count() == |
2841 KMarkingModeIconArraySize ) |
2844 KMarkingModeIconArraySize ) |
2842 #else |
|
2843 iExtension->iMarkingIconArray->Count() == 2 ) |
|
2844 #endif // RD_TOUCH2_MARKING |
|
2845 { |
2845 { |
2846 if ( AknLayoutUtils::LayoutMirrored() ) |
2846 if ( AknLayoutUtils::LayoutMirrored() ) |
2847 { |
2847 { |
2848 textRect.iBr.iX -= |
2848 textRect.iBr.iX -= |
2849 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( |
2849 AknLayoutScalable_Avkon::list_single_graphic_pane_t1( |