X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=builder%2Fdali-builder.cpp;h=ac2b1dfdaaa8777765fa44314aaef794d82b4a0c;hb=ac7bf7c5e975fdc70fd2397bd5ca0e34a7eb15bc;hp=97af4f0a2e3eafbe3490bc17b285063b95b14f01;hpb=b6f0744c6942ff40e8f2ee49e234e5d7a59fd36b;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp index 97af4f0..ac2b1df 100644 --- a/builder/dali-builder.cpp +++ b/builder/dali-builder.cpp @@ -193,14 +193,15 @@ private: void ReloadJsonFile(Builder& builder, Layer& layer) { Stage stage = Stage::GetCurrent(); + stage.SetBackgroundColor( Color::WHITE ); builder = Builder::New(); builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit ); Property::Map defaultDirs; - defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR; - defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR; - defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR; + defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR; + defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR; + defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR; builder.AddConstants( defaultDirs ); @@ -296,15 +297,10 @@ private: //------------------------------------------------------------------------------ int main(int argc, char **argv) { - Application dali_app = Application::New(&argc, &argv); + Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH); ExampleApp app(dali_app); - std::cout << "DALi Core: \t" << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << " (" << CORE_BUILD_DATE << ")" << std::endl; - std::cout << "DALi Adaptor: \t" << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << " (" << ADAPTOR_BUILD_DATE << ")\n"; - std::cout << "DALi Toolkit: \t" << Toolkit::TOOLKIT_MAJOR_VERSION << "." << Toolkit::TOOLKIT_MINOR_VERSION << "." << Toolkit::TOOLKIT_MICRO_VERSION << " (" << Toolkit::TOOLKIT_BUILD_DATE << ")\n"; - - if(argc > 1) { std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;