equal
deleted
inserted
replaced
606 { |
606 { |
607 layoutMode = ELayoutModeUsual; |
607 layoutMode = ELayoutModeUsual; |
608 } |
608 } |
609 |
609 |
610 MAknsSkinInstance* skin = AknsUtils::SkinInstance(); |
610 MAknsSkinInstance* skin = AknsUtils::SkinInstance(); |
|
611 |
|
612 if ( iIndicatorBitmaps[layoutMode]->Count() <= 0 || !iIndicatorBitmaps[layoutMode]->At( 0 ) ) |
|
613 { |
|
614 |
|
615 __ASSERT_DEBUG( EFalse, User::Panic( _L("indicatorcount"),iIndicatorBitmaps[layoutMode]->Count())); |
|
616 return; |
|
617 } |
611 TSize iconSize( iIndicatorBitmaps[layoutMode]->At( 0 )->SizeInPixels() ); |
618 TSize iconSize( iIndicatorBitmaps[layoutMode]->At( 0 )->SizeInPixels() ); |
612 TInt iconWidth = iconSize.iWidth; |
619 TInt iconWidth = iconSize.iWidth; |
613 TInt iconHeight = iconSize.iHeight; |
620 TInt iconHeight = iconSize.iHeight; |
614 |
621 |
615 if ( iState != EAknIndicatorStateOff ) |
622 if ( iState != EAknIndicatorStateOff ) |
650 } |
657 } |
651 iconWidth = progressInPixels; |
658 iconWidth = progressInPixels; |
652 } |
659 } |
653 } |
660 } |
654 |
661 |
655 if ( iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ) && |
662 if ( ( iAnimState * 2 + 1 ) < iIndicatorBitmaps[layoutMode]->Count() |
656 iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 + 1 ) ) |
663 && iIndicatorBitmaps[layoutMode]->At(iAnimState * 2) |
|
664 && iIndicatorBitmaps[layoutMode]->At(iAnimState * 2 + 1)) |
657 { |
665 { |
658 CFbsBitmap* mask = iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 + 1 ); |
666 CFbsBitmap* mask = iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 + 1 ); |
659 if ( iExtension && iExtension->iFader ) |
667 if ( iExtension && iExtension->iFader ) |
660 { |
668 { |
661 mask = iExtension->iFader->FadeMask( |
669 mask = iExtension->iFader->FadeMask( |
669 iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ), |
677 iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ), |
670 TRect( 0, 0, iconWidth, iconHeight), |
678 TRect( 0, 0, iconWidth, iconHeight), |
671 mask, |
679 mask, |
672 ETrue ); |
680 ETrue ); |
673 } |
681 } |
674 else if ( iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ) ) |
682 else if (( iAnimState * 2 ) < iIndicatorBitmaps[layoutMode]->Count() |
|
683 && iIndicatorBitmaps[layoutMode]->At(iAnimState * 2) ) |
675 { |
684 { |
676 // Draw editor indicator bitmap without mask |
685 // Draw editor indicator bitmap without mask |
677 CFbsBitmap* mask = iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ); |
686 CFbsBitmap* mask = iIndicatorBitmaps[layoutMode]->At( iAnimState * 2 ); |
678 if ( iExtension && iExtension->iFader ) |
687 if ( iExtension && iExtension->iFader ) |
679 { |
688 { |