From 853d84113ed359ae239d4a4b19abac572cc72292 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 29 May 2017 10:28:06 +0900 Subject: [PATCH] Fix to get a Stage::SceneCreatedSignal() - The signal should be emitted after Application::InitSignal() is emitted. Change-Id: I03256291e0a31ed85b169eb56effdb787a50e28d --- adaptors/common/application-impl.cpp | 5 +++++ adaptors/common/application-impl.h | 5 +++++ adaptors/devel-api/adaptor-framework/application-extensions.cpp | 5 +++++ adaptors/devel-api/adaptor-framework/application-extensions.h | 7 ++++++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index 876cc98..c949758 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -198,7 +198,10 @@ void Application::DoInit() { Dali::StyleMonitor::Get().SetTheme( mStylesheet ); } +} +void Application::DoStart() +{ mAdaptor->NotifySceneCreated(); } @@ -247,6 +250,8 @@ void Application::OnInit() Dali::Application application(this); mInitSignal.Emit( application ); + + DoStart(); } void Application::OnTerminate() diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h index aeadb17..4af4577 100644 --- a/adaptors/common/application-impl.h +++ b/adaptors/common/application-impl.h @@ -141,6 +141,11 @@ public: // Lifecycle functionality void DoInit(); /** + * Called after OnInit is called or the framework is started. + */ + void DoStart(); + + /** * Called when OnTerminate is called or the framework is terminated. */ void DoTerminate(); diff --git a/adaptors/devel-api/adaptor-framework/application-extensions.cpp b/adaptors/devel-api/adaptor-framework/application-extensions.cpp index e03b298..8cd32c8 100755 --- a/adaptors/devel-api/adaptor-framework/application-extensions.cpp +++ b/adaptors/devel-api/adaptor-framework/application-extensions.cpp @@ -47,6 +47,11 @@ void ApplicationExtensions::Init() Internal::Adaptor::GetImplementation(*mApplication).DoInit(); } +void ApplicationExtensions::Start() +{ + Internal::Adaptor::GetImplementation(*mApplication).DoStart(); +} + void ApplicationExtensions::Terminate() { Internal::Adaptor::GetImplementation(*mApplication).DoTerminate(); diff --git a/adaptors/devel-api/adaptor-framework/application-extensions.h b/adaptors/devel-api/adaptor-framework/application-extensions.h index bee9629..51f55a2 100755 --- a/adaptors/devel-api/adaptor-framework/application-extensions.h +++ b/adaptors/devel-api/adaptor-framework/application-extensions.h @@ -56,11 +56,16 @@ public: /** - * @brief Called wwhen the framework is initialised. + * @brief Called when the framework is initialised. * @SINCE_1_2.7 */ void Init(); + /** + * @brief Called when the framework is started. + */ + void Start(); + /** * @brief Called when the framework is terminated. * @SINCE_1_2.7 -- 2.7.4