X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Fdali-toolkit-test-utils%2Ftoolkit-text-utils.cpp;h=e3ccad8b616026b1a332cd6d89fe22a8e95846b9;hb=87a9019904ab49c42f1e32e7ebb6a1512b0dc28c;hp=08f2c63e2d4db61cd3c917ef68673b5ad6b64283;hpb=9346cf33ef49063185d54fbbfc186864d96c51ca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp index 08f2c63..e3ccad8 100755 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp @@ -108,7 +108,8 @@ void CreateTextModel( const std::string& text, visualModel = VisualModel::New(); MarkupProcessData markupProcessData( logicalModel->mColorRuns, - logicalModel->mFontDescriptionRuns ); + logicalModel->mFontDescriptionRuns, + logicalModel->mEmbeddedItems ); Length textSize = 0u; const uint8_t* utf8 = NULL; @@ -307,7 +308,8 @@ void CreateTextModel( const std::string& text, Text::HorizontalAlignment::BEGIN, Text::LineWrap::WORD, outlineWidth, - true ); + true, + false ); Vector& lines = visualModel->mLines; @@ -322,11 +324,13 @@ void CreateTextModel( const std::string& text, layoutParameters.startLineIndex = 0u; layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count(); + bool isAutoScroll = false; layoutEngine.LayoutText( layoutParameters, glyphPositions, lines, layoutSize, - false ); + false, + isAutoScroll ); // 10) Reorder the lines if( 0u != bidirectionalInfo.Count() ) @@ -366,7 +370,9 @@ void CreateTextModel( const std::string& text, characterCount, Text::HorizontalAlignment::BEGIN, lines, - alignmentOffset ); + alignmentOffset, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false ); } }