equal
deleted
inserted
replaced
2540 { |
2540 { |
2541 subcellColors = &aColors; |
2541 subcellColors = &aColors; |
2542 } |
2542 } |
2543 |
2543 |
2544 TRgb color; |
2544 TRgb color; |
2545 |
2545 CListBoxView* view = static_cast<CEikListBox*>( Control() )->View(); |
|
2546 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
2546 if (aHighlight) |
2547 if (aHighlight) |
2547 { |
2548 { |
2548 color = subcellColors->iHighlightedText; |
2549 color = subcellColors->iHighlightedText; |
2549 aGc.SetBrushColor(subcellColors->iHighlightedBack); |
2550 aGc.SetBrushColor(subcellColors->iHighlightedBack); |
2550 if ( AknsUtils::AvkonSkinEnabled() ) |
2551 if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) |
2551 { |
2552 { |
2552 if ( iExtension->iHighlightedTextColor != NULL ) |
2553 if ( iExtension->iHighlightedTextColor != NULL ) |
2553 { |
2554 { |
2554 color = iExtension->iHighlightedTextColor; |
2555 color = iExtension->iHighlightedTextColor; |
2555 } |
2556 } |
2557 } |
2558 } |
2558 else |
2559 else |
2559 { |
2560 { |
2560 color = subcellColors->iText; |
2561 color = subcellColors->iText; |
2561 aGc.SetBrushColor(subcellColors->iBack); |
2562 aGc.SetBrushColor(subcellColors->iBack); |
2562 if ( AknsUtils::AvkonSkinEnabled() ) |
2563 if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) |
2563 { |
2564 { |
2564 if ( iExtension->iTextColor != NULL ) |
2565 if ( iExtension->iTextColor != NULL ) |
2565 { |
2566 { |
2566 color = iExtension->iTextColor; |
2567 color = iExtension->iTextColor; |
2567 } |
2568 } |
2859 |
2860 |
2860 if ( listbox->View()->ItemDrawer()->Flags() |
2861 if ( listbox->View()->ItemDrawer()->Flags() |
2861 & CListItemDrawer::EMarkingModeEnabled |
2862 & CListItemDrawer::EMarkingModeEnabled |
2862 && !aProperties.IsSelectionHidden() |
2863 && !aProperties.IsSelectionHidden() |
2863 && iExtension->iMarkingIconArray |
2864 && iExtension->iMarkingIconArray |
2864 #ifdef RD_TOUCH2_MARKING |
|
2865 && iExtension->iMarkingIconArray->Count() |
2865 && iExtension->iMarkingIconArray->Count() |
2866 == KMarkingModeIconArraySize ) |
2866 == KMarkingModeIconArraySize ) |
2867 #else |
|
2868 && iExtension->iMarkingIconArray->Count() == 2 ) |
|
2869 #endif // RD_TOUCH2_MARKING |
|
2870 { |
2867 { |
2871 if ( AknLayoutUtils::LayoutMirrored() ) |
2868 if ( AknLayoutUtils::LayoutMirrored() ) |
2872 { |
2869 { |
2873 textRect.iBr.iX -= |
2870 textRect.iBr.iX -= |
2874 AknLayoutScalable_Avkon::list_double_graphic_pane_t1( |
2871 AknLayoutScalable_Avkon::list_double_graphic_pane_t1( |
4453 } |
4450 } |
4454 else |
4451 else |
4455 { |
4452 { |
4456 subcellColors = &aColors; |
4453 subcellColors = &aColors; |
4457 } |
4454 } |
4458 |
4455 CListBoxView* view = listbox->View(); |
|
4456 TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; |
4459 if (aHighlight) |
4457 if (aHighlight) |
4460 { |
4458 { |
4461 aGc.SetPenColor(subcellColors->iHighlightedText); |
4459 aGc.SetPenColor(subcellColors->iHighlightedText); |
4462 aGc.SetBrushColor(subcellColors->iHighlightedBack); |
4460 aGc.SetBrushColor(subcellColors->iHighlightedBack); |
4463 if ( skinEnabled ) |
4461 if ( skinEnabled && !useOverrideColor ) |
4464 { |
4462 { |
4465 if ( iExtension->iHighlightedTextColor != NULL ) |
4463 if ( iExtension->iHighlightedTextColor != NULL ) |
4466 { |
4464 { |
4467 aGc.SetPenColor( iExtension->iHighlightedTextColor ); |
4465 aGc.SetPenColor( iExtension->iHighlightedTextColor ); |
4468 } |
4466 } |
4471 else |
4469 else |
4472 { |
4470 { |
4473 aGc.SetPenColor(subcellColors->iText); |
4471 aGc.SetPenColor(subcellColors->iText); |
4474 aGc.SetBrushColor(subcellColors->iBack); |
4472 aGc.SetBrushColor(subcellColors->iBack); |
4475 |
4473 |
4476 if ( skinEnabled ) |
4474 if ( skinEnabled && !useOverrideColor ) |
4477 { |
4475 { |
4478 if ( iExtension->iTextColor != NULL ) |
4476 if ( iExtension->iTextColor != NULL ) |
4479 { |
4477 { |
4480 aGc.SetPenColor( iExtension->iTextColor ); |
4478 aGc.SetPenColor( iExtension->iTextColor ); |
4481 } |
4479 } |