Merge "Removing TextureUploadObserver from symbol table" into devel/master

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit-internal / dali-toolkit-test-utils / toolkit-text-utils.cpp

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 31d81af..43fc5ac 100644 (file)
--- 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
@@ -281,7 +281,8 @@ void CreateTextModel( const std::string& text,
                                        charactersToGlyph.Begin(),
                                        glyphsPerCharacter.Begin(),
                                        numberOfGlyphs,
-                                       Layout::HORIZONTAL_ALIGN_BEGIN );
+                                       Layout::HORIZONTAL_ALIGN_BEGIN,
+                                       Layout::LineWrap::WORD );
 
   Vector<LineRun>& lines = visualModel->mLines;
 
@@ -334,11 +335,13 @@ void CreateTextModel( const std::string& text,
 
   if( options.align )
   {
+    float alignmentOffset = 0.f;
     layoutEngine.Align( textArea,
                         0u,
                         numberOfCharacters,
                         Layout::HORIZONTAL_ALIGN_BEGIN,
-                        lines );
+                        lines,
+                        alignmentOffset );
   }
 }