Merge " Calculate a new height when text was changed." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-model.cpp

diff --git a/dali-toolkit/internal/text/text-model.cpp b/dali-toolkit/internal/text/text-model.cpp
index eca74df..f158dae 100644 (file)
--- a/dali-toolkit/internal/text/text-model.cpp
+++ b/dali-toolkit/internal/text/text-model.cpp
@@ -106,8 +106,11 @@ Model::Model()
 : mLogicalModel(),
   mVisualModel(),
   mScrollPosition(),
+  mScrollPositionLast(),
   mHorizontalAlignment( Layout::HORIZONTAL_ALIGN_BEGIN ),
   mVerticalAlignment( Layout::VERTICAL_ALIGN_TOP ),
+  mLineWrapMode( Layout::LineWrap::WORD ),
+  mAlignmentOffset( 0.0f ),
   mElideEnabled( false )
 {
   mLogicalModel = LogicalModel::New();