X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fsegmentation.cpp;h=5e590b5bc7b5f5fe93509a8ea051ea639b58d46c;hp=a7c7135590943a2692376f4771a751e9a5d05d74;hb=e208465b3f8e6cffb9dfca62142f73c6ba166957;hpb=0dd2826b16facb7e8f21ffb86853bd1b0afb97b4

diff --git a/dali-toolkit/internal/text/segmentation.cpp b/dali-toolkit/internal/text/segmentation.cpp
index a7c7135..5e590b5 100644
--- a/dali-toolkit/internal/text/segmentation.cpp
+++ b/dali-toolkit/internal/text/segmentation.cpp
@@ -85,29 +85,59 @@ void SetLineBreakInfo( const Vector<Character>& text,
 }
 
 void SetWordBreakInfo( const Vector<Character>& text,
+                       CharacterIndex startIndex,
+                       Length numberOfCharacters,
                        Vector<WordBreakInfo>& wordBreakInfo )
 {
-  const Length numberOfCharacters = text.Count();
+  const Length totalNumberOfCharacters = text.Count();
 
-  if( 0u == numberOfCharacters )
+  if( 0u == totalNumberOfCharacters )
   {
     // Nothing to do if there are no characters.
     return;
   }
 
+  // Resize the vector.
+  wordBreakInfo.Resize( totalNumberOfCharacters );
+
+  // Whether the current buffer is being updated or is set from scratch.
+  const bool updateCurrentBuffer = numberOfCharacters < totalNumberOfCharacters;
+
+  WordBreakInfo* wordBreakInfoBuffer = NULL;
+  Vector<WordBreakInfo> newWordBreakInfo;
+
+  if( updateCurrentBuffer )
+  {
+    newWordBreakInfo.Resize( numberOfCharacters );
+    wordBreakInfoBuffer = newWordBreakInfo.Begin();
+  }
+  else
+  {
+    wordBreakInfoBuffer = wordBreakInfo.Begin();
+  }
+
   // Retrieve the word break info.
-  wordBreakInfo.Resize( numberOfCharacters );
-  TextAbstraction::Segmentation::Get().GetWordBreakPositions( text.Begin(),
+  TextAbstraction::Segmentation::Get().GetWordBreakPositions( text.Begin() + startIndex,
                                                               numberOfCharacters,
-                                                              wordBreakInfo.Begin() );
+                                                              wordBreakInfoBuffer );
+
+  // If the word break info is updated, it needs to be inserted in the model.
+  if( updateCurrentBuffer )
+  {
+    wordBreakInfo.Insert( wordBreakInfo.Begin() + startIndex,
+                          newWordBreakInfo.Begin(),
+                          newWordBreakInfo.End() );
+    wordBreakInfo.Resize( totalNumberOfCharacters );
+  }
+
 #ifdef DEBUG_ENABLED
   if( gLogFilter->IsEnabledFor(Debug::Verbose) )
   {
     std::string utf8;
-    Utf32ToUtf8( text.Begin(), numberOfCharacters, utf8 );
+    Utf32ToUtf8( text.Begin(), totalNumberOfCharacters, utf8 );
 
     std::string info;
-    info.reserve( numberOfCharacters );
+    info.reserve( totalNumberOfCharacters );
     for( unsigned int i=0; i<wordBreakInfo.Count(); ++i )
     {
       info.push_back( static_cast<char>('0' + wordBreakInfo[i]) );