X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-view%2Ftext-view.cpp;h=36d7ec3e7df7da30588c4dc23f4e901c421f6e11;hp=2221ebd295ba485b5786e4b3666b6c013d342280;hb=7e315a440bad7033d19fefa8f9952d625ee6f076;hpb=f3aa26628968f52af058c97ea7b0f7a19889049c

diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
index 2221ebd..36d7ec3 100644
--- a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
+++ b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
@@ -34,6 +34,7 @@ TextView::CharacterLayoutInfo::CharacterLayoutInfo()
 : mSize(),
   mPosition(),
   mIsNewLineChar( false ),
+  mIsNewParagraphChar( false ),
   mIsRightToLeftCharacter( false ),
   mIsVisible( true ),
   mDescender()
@@ -47,7 +48,8 @@ TextView::CharacterLayoutInfo::~CharacterLayoutInfo()
 TextView::CharacterLayoutInfo::CharacterLayoutInfo( const TextView::CharacterLayoutInfo& characterLayoutInfo )
 : mSize( characterLayoutInfo.mSize ),
   mPosition( characterLayoutInfo.mPosition ),
-  mIsNewLineChar( characterLayoutInfo.mIsNewLineChar ),
+  mIsNewLineChar( characterLayoutInfo.mIsNewParagraphChar ),
+  mIsNewParagraphChar( characterLayoutInfo.mIsNewParagraphChar ),
   mIsRightToLeftCharacter( characterLayoutInfo.mIsRightToLeftCharacter ),
   mIsVisible( characterLayoutInfo.mIsVisible ),
   mDescender( characterLayoutInfo.mDescender )
@@ -58,7 +60,8 @@ TextView::CharacterLayoutInfo& TextView::CharacterLayoutInfo::operator=( const T
 {
   mSize = characterLayoutInfo.mSize;
   mPosition = characterLayoutInfo.mPosition;
-  mIsNewLineChar = characterLayoutInfo.mIsNewLineChar;
+  mIsNewLineChar = characterLayoutInfo.mIsNewParagraphChar;
+  mIsNewParagraphChar = characterLayoutInfo.mIsNewParagraphChar;
   mIsRightToLeftCharacter = characterLayoutInfo.mIsRightToLeftCharacter;
   mIsVisible = characterLayoutInfo.mIsVisible;
   mDescender = characterLayoutInfo.mDescender;
@@ -68,13 +71,14 @@ TextView::CharacterLayoutInfo& TextView::CharacterLayoutInfo::operator=( const T
 
 TextView::CharacterLayoutInfo::CharacterLayoutInfo( const Size& size,
                                                     const Vector3& position,
-                                                    bool isNewLineChar,
+                                                    bool isNewParagraphChar,
                                                     bool isRightToLeftCharacter,
                                                     bool isVisible,
                                                     float descender )
 : mSize( size ),
   mPosition( position ),
-  mIsNewLineChar( isNewLineChar ),
+  mIsNewLineChar( isNewParagraphChar ),
+  mIsNewParagraphChar( isNewParagraphChar ),
   mIsRightToLeftCharacter( isRightToLeftCharacter ),
   mIsVisible( isVisible ),
   mDescender( descender )
@@ -360,7 +364,7 @@ bool TextView::IsScrollPositionTrimmed() const
   return GetImpl( *this ).IsScrollPositionTrimmed();
 }
 
-TextView::ScrolledSignalV2& TextView::ScrolledSignal()
+TextView::ScrolledSignalType& TextView::ScrolledSignal()
 {
   return GetImpl( *this ).ScrolledSignal();
 }