From 9d8c0bfbf6a4dfa8aa4a94f8884bc8b5989cbdbc Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 16 Jun 2017 15:49:12 +0900 Subject: [PATCH] Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation. Change-Id: I94d495873c54fbe25b421da4622013ffc91a6c3c Signed-off-by: minho.sun --- .../internal/controls/text-controls/text-editor-impl.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 --- 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 ) { -- 2.7.4