Fix to get a Stage::SceneCreatedSignal()

- The signal should be emitted after Application::InitSignal() is emitted.

Change-Id: I03256291e0a31ed85b169eb56effdb787a50e28d

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index 876cc982a60315618faf56ff0ce6b71b71d5b7ab..c9497589db9c09621639f90eae42e45846083d99 100644 (file)
--- 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 aeadb176ed18528cb199cec55c44aae22f3b8078..4af45778862fa314d84c9a49057303fe62d647ce 100644 (file)
--- a/adaptors/common/application-impl.h
+++ b/adaptors/common/application-impl.h
@@ -140,6 +140,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.
    */

diff --git a/adaptors/devel-api/adaptor-framework/application-extensions.cpp b/adaptors/devel-api/adaptor-framework/application-extensions.cpp
index e03b298924310457e9fea451b8646cbf5b43678e..8cd32c8e8cfc6d2bcd505c260d2fb23d42d7fcd2 100755 (executable)
--- 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 bee9629a2d62da5300b6b4b93b2256e014261a6c..51f55a27b03df497fb6aa2fe3cbe8e8c7d6222e4 100755 (executable)
--- 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