From 8529741859078215c5a2bbbd1dbb2398680821d8 Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Wed, 31 May 2017 11:47:51 +0900 Subject: [PATCH] [Tizen] NotifySceneCreated should be called in NUI This reverts commit 7f401e1c48a1dc8a0207c0fdcee9699555c71df1. Change-Id: I752da9ce7f902312d927b303bd3affd1e695a83d --- adaptors/common/application-impl.cpp | 9 +++++++++ adaptors/common/application-impl.h | 1 + 2 files changed, 10 insertions(+) diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index 5dfa505..dedf854 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -83,6 +83,7 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee mName(), mStylesheet( stylesheet ), mEnvironmentOptions(), + mInitialized( false ), mSlotDelegate( this ) { // Get mName from environment options @@ -198,6 +199,12 @@ void Application::DoInit() { Dali::StyleMonitor::Get().SetTheme( mStylesheet ); } + + if( !mInitialized ) + { + mAdaptor->NotifySceneCreated(); + mInitialized = true; + } } void Application::DoTerminate() @@ -230,6 +237,8 @@ void Application::OnInit() { mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) ); + mInitialized = true; + DoInit(); // Wire up the LifecycleController diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h index aeadb17..642bf74 100644 --- a/adaptors/common/application-impl.h +++ b/adaptors/common/application-impl.h @@ -342,6 +342,7 @@ private: std::string mStylesheet; EnvironmentOptions mEnvironmentOptions; bool mUseRemoteSurface; + bool mInitialized; SlotDelegate< Application > mSlotDelegate; }; -- 2.7.4