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
Merge "Added option to test harness execution to only summarize failures" into devel...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Layout.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
index
5f08853
..
3f6a9a6
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
@@
-169,7
+169,8
@@
bool LayoutTextTest( const LayoutTextData& data )
visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
totalNumberOfGlyphs,
visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
totalNumberOfGlyphs,
- Layout::HORIZONTAL_ALIGN_BEGIN );
+ Layout::HORIZONTAL_ALIGN_BEGIN,
+ Layout::LineWrap::WORD );
layoutParameters.isLastNewParagraph = isLastNewParagraph;
layoutParameters.isLastNewParagraph = isLastNewParagraph;
@@
-384,7
+385,8
@@
bool ReLayoutRightToLeftLinesTest( const ReLayoutRightToLeftLinesData& data )
visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
visualModel->mGlyphs.Count(),
visualModel->mCharactersToGlyph.Begin(),
visualModel->mGlyphsPerCharacter.Begin(),
visualModel->mGlyphs.Count(),
- Layout::HORIZONTAL_ALIGN_BEGIN );
+ Layout::HORIZONTAL_ALIGN_BEGIN,
+ Layout::LineWrap::WORD );
layoutParameters.numberOfBidirectionalInfoRuns = logicalModel->mBidirectionalLineInfo.Count();
layoutParameters.lineBidirectionalInfoRunsBuffer = logicalModel->mBidirectionalLineInfo.Begin();
layoutParameters.numberOfBidirectionalInfoRuns = logicalModel->mBidirectionalLineInfo.Count();
layoutParameters.lineBidirectionalInfoRunsBuffer = logicalModel->mBidirectionalLineInfo.Begin();