X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=builder%2Fdali-builder.cpp;h=4481c3d52ad5387828850af720cb5c230ff44035;hb=5e6d8be6df5f4de9e8c1efec97ee68fd226b4d1a;hp=0a693a7d82abe3d7583d8485967020c19b28b680;hpb=0ba76b77106d97a946c0ec83b16cbf57394bfffc;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp index 0a693a7..4481c3d 100644 --- a/builder/dali-builder.cpp +++ b/builder/dali-builder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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 ); @@ -294,13 +295,12 @@ private: // // //------------------------------------------------------------------------------ -int main(int argc, char **argv) +int DALI_EXPORT_API 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); - if(argc > 1) { std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;