projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove APIs deprecated in Tizen 3.0
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
bidirectional-support.cpp
diff --git
a/dali-toolkit/internal/text/bidirectional-support.cpp
b/dali-toolkit/internal/text/bidirectional-support.cpp
old mode 100644
(file)
new mode 100755
(executable)
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<Character>& text,
const Vector<LineBreakInfo>& lineBreakInfo,
CharacterIndex startIndex,
Length numberOfCharacters,
const Vector<LineBreakInfo>& lineBreakInfo,
CharacterIndex startIndex,
Length numberOfCharacters,
- Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo )
+ Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo,
+ bool matchSystemLanguageDirection,
+ Dali::LayoutDirection::Type layoutDirection )
{
// Find where to insert the new paragraphs.
BidirectionalRunIndex bidiInfoIndex = 0u;
{
// Find where to insert the new paragraphs.
BidirectionalRunIndex bidiInfoIndex = 0u;
@@
-146,7
+148,7
@@
void SetBidirectionalInfo( const Vector<Character>& text,
break;
}
break;
}
- if( !hasRightToLeftScript &&
TextAbstraction::IsRightToLeftScript( scriptRun.script )
)
+ if( !hasRightToLeftScript &&
scriptRun.isRightToLeft
)
{
// The script is right to left.
hasRightToLeftScript = true;
{
// The script is right to left.
hasRightToLeftScript = true;
@@
-165,7
+167,9
@@
void SetBidirectionalInfo( const Vector<Character>& 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,
// 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;
bidirectionalInfo.Insert( bidirectionalInfo.Begin() + bidiInfoIndex, bidirectionalRun );
++bidiInfoIndex;