From: Shinwoo Kim Date: Tue, 1 Jun 2021 02:08:17 +0000 (+0900) Subject: Revert "[Tizen] Fix TextChanged signal." X-Git-Tag: submit/tizen/20210601.080645~65 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2ec0940d388d2cacd3f477b74db83e3ce410c8e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] Fix TextChanged signal." This reverts commit 5511b058e12120555b4b3c3b35b1cf37c52a2990. --- 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 48e01188be..792cd7dbcb 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1470,12 +1470,6 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container) ResizeActor(mActiveLayer, contentSize); } - // If there is text changed, callback is called. - if(mTextChanged) - { - EmitTextChangedSignal(); - } - const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); if((Text::Controller::NONE_UPDATED != updateTextType) || @@ -1495,6 +1489,12 @@ void TextEditor::OnRelayout(const Vector2& size, RelayoutContainer& container) } RenderText(updateTextType); + + // If there is text changed, callback is called. + if(mTextChanged) + { + EmitTextChangedSignal(); + } } // The text-editor emits signals when the input style changes. These changes of style are diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index dd117dffe6..ceb40f97ee 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1409,12 +1409,6 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) ResizeActor(mActiveLayer, contentSize); } - // If there is text changed, callback is called. - if(mTextChanged) - { - EmitTextChangedSignal(); - } - const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); if((Text::Controller::NONE_UPDATED != updateTextType) || @@ -1434,6 +1428,12 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) } RenderText(updateTextType); + + // If there is text changed, callback is called. + if(mTextChanged) + { + EmitTextChangedSignal(); + } } // The text-field emits signals when the input style changes. These changes of style are