equal
deleted
inserted
replaced
743 |
743 |
744 iTextVisual->EnableShadow(iFlags & KFsTreeListItemTextShadow); |
744 iTextVisual->EnableShadow(iFlags & KFsTreeListItemTextShadow); |
745 iTextVisual->SetColor( textColor ); |
745 iTextVisual->SetColor( textColor ); |
746 iTextVisual->SetTextStyle( styleId ); |
746 iTextVisual->SetTextStyle( styleId ); |
747 |
747 |
748 iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapManual); |
748 // iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapManual); |
749 |
749 |
750 TAlfAlignHorizontal currTextAlign( EAlfAlignHLocale ); |
750 TAlfAlignHorizontal currTextAlign( EAlfAlignHLocale ); |
751 currTextAlign = CurrentTextAlignmentL( iTextAlign, &data->Data(), iTextVisual ); |
751 currTextAlign = CurrentTextAlignmentL( iTextAlign, &data->Data(), iTextVisual ); |
752 iTextVisual->SetAlign( currTextAlign, EAlfAlignVCenter ); |
752 iTextVisual->SetAlign( currTextAlign, EAlfAlignVCenter ); |
753 |
753 |
848 if ( aMarqueeType == EFsTextMarqueeNone ) |
848 if ( aMarqueeType == EFsTextMarqueeNone ) |
849 { |
849 { |
850 return; |
850 return; |
851 } |
851 } |
852 |
852 |
853 iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapManual); |
|
854 |
853 |
855 textWidth = iTextVisual->SubstringExtents(0, iTextVisual->Text().Length()).Width(); |
854 textWidth = iTextVisual->SubstringExtents(0, iTextVisual->Text().Length()).Width(); |
856 marqueeSize = textWidth - iViewportLayout->Size().iX.Target(); |
855 marqueeSize = textWidth - iViewportLayout->Size().iX.Target(); |
857 |
856 |
858 if (iTextVisual && (marqueeSize>0)) |
857 if (iTextVisual && (marqueeSize>0)) |
859 { |
858 { |
|
859 iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapManual); |
|
860 |
860 TSize size(textWidth,iViewportLayout->Size().iY.Target()); |
861 TSize size(textWidth,iViewportLayout->Size().iY.Target()); |
861 if ( aMarqueeType == EFsTextMarqueeForth ) |
862 if ( aMarqueeType == EFsTextMarqueeForth ) |
862 { |
863 { |
863 iTextMarquee->SetScrollType( TFsMarqueeClet::EScrollForth ); |
864 iTextMarquee->SetScrollType( TFsMarqueeClet::EScrollForth ); |
864 } |
865 } |