X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fbidirectional-support.cpp;h=26e99b7a0b9da6fe02169f78132d4f1462329d1f;hp=57dc6137a457711ba61f75c9aee655d702bab9c4;hb=ff0db3ef923086d96dc8c2eb8501607da9c3c21e;hpb=eefe73d95db6e9be0b518c5b796e1f1a081cce12 diff --git a/dali-toolkit/internal/text/bidirectional-support.cpp b/dali-toolkit/internal/text/bidirectional-support.cpp old mode 100644 new mode 100755 index 57dc613..26e99b7 --- a/dali-toolkit/internal/text/bidirectional-support.cpp +++ b/dali-toolkit/internal/text/bidirectional-support.cpp @@ -88,7 +88,9 @@ void SetBidirectionalInfo( const Vector& text, const Vector& lineBreakInfo, CharacterIndex startIndex, Length numberOfCharacters, - Vector& bidirectionalInfo ) + Vector& bidirectionalInfo, + bool matchSystemLanguageDirection, + Dali::LayoutDirection::Type layoutDirection ) { // Find where to insert the new paragraphs. BidirectionalRunIndex bidiInfoIndex = 0u; @@ -146,7 +148,7 @@ void SetBidirectionalInfo( const Vector& text, break; } - if( !hasRightToLeftScript && TextAbstraction::IsRightToLeftScript( scriptRun.script ) ) + if( !hasRightToLeftScript && scriptRun.isRightToLeft ) { // The script is right to left. hasRightToLeftScript = true; @@ -165,7 +167,9 @@ void SetBidirectionalInfo( const Vector& text, // Create the bidirectional info for the whole paragraph and store the index to the table with this info in the run. bidirectionalRun.bidirectionalInfoIndex = bidirectionalSupport.CreateInfo( textBuffer + bidirectionalRun.characterRun.characterIndex, - bidirectionalRun.characterRun.numberOfCharacters ); + bidirectionalRun.characterRun.numberOfCharacters, + matchSystemLanguageDirection, + layoutDirection ); bidirectionalInfo.Insert( bidirectionalInfo.Begin() + bidiInfoIndex, bidirectionalRun ); ++bidiInfoIndex;