From eb3f729d9b7ca6fd7e9af953380b41eef4fc0ecb Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Thu, 7 Jun 2018 14:49:32 +0900 Subject: [PATCH] Add a parameter of AddIdle function Change-Id: I5aac12993d17d41830116298845a3b870e1e6d85 --- .../src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp | 2 +- dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp | 2 +- dali-toolkit/internal/controls/text-controls/text-field-impl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp index 3ff177c..eb1f2b8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp @@ -97,7 +97,7 @@ void Adaptor::Stop() { } -bool Adaptor::AddIdle( CallbackBase* callback ) +bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue ) { const bool isAvailable = IsAvailable(); 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 80e884a..3360256 100755 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1387,7 +1387,7 @@ void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container ) { // @note: The callback manager takes the ownership of the callback object. mIdleCallback = MakeCallback( this, &TextEditor::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback ); + adaptor.AddIdle( mIdleCallback, false ); } } } 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 d92be64..dd34031 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1433,7 +1433,7 @@ void TextField::OnRelayout( const Vector2& size, RelayoutContainer& container ) { // @note: The callback manager takes the ownership of the callback object. mIdleCallback = MakeCallback( this, &TextField::OnIdleSignal ); - adaptor.AddIdle( mIdleCallback ); + adaptor.AddIdle( mIdleCallback, false ); } } } -- 2.7.4