Merge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into...

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index eb2264b..fb97a76 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1502,14 +1502,6 @@ void TextEditor::UpdateScrollBar()
     return;
   }
 
-  // If scrolling is not started, start scrolling and emit ScrollStateChangedSignal
-  if( !mScrollStarted )
-  {
-    mScrollStarted = true;
-    Dali::Toolkit::TextEditor handle( GetOwner() );
-    mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::STARTED );
-  }
-
   CustomActor self = Self();
   if( !mScrollBar )
   {
@@ -1553,6 +1545,14 @@ void TextEditor::UpdateScrollBar()
     self.SetProperty( propertyScrollContentSize, layoutSize );
   }
 
+  // If scrolling is not started, start scrolling and emit ScrollStateChangedSignal
+  if( !mScrollStarted )
+  {
+    mScrollStarted = true;
+    Dali::Toolkit::TextEditor handle( GetOwner() );
+    mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::STARTED );
+  }
+
   Actor indicator = mScrollBar.GetScrollIndicator();
   if( mAnimation )
   {