projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-demo.git]
/
builder
/
dali-builder.cpp
diff --git
a/builder/dali-builder.cpp
b/builder/dali-builder.cpp
index
d423d85
..
4481c3d
100644
(file)
--- a/
builder/dali-builder.cpp
+++ b/
builder/dali-builder.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-56,7
+56,7
@@
std::string JSON_BROKEN(" \
{ \
'type':'TextActor', \
'size': [50,50,1], \
{ \
'type':'TextActor', \
'size': [50,50,1], \
- 'parent
-origin': 'CENTER',
\
+ 'parent
Origin': 'CENTER',
\
'text':'COULD NOT LOAD JSON FILE' \
} \
] \
'text':'COULD NOT LOAD JSON FILE' \
} \
] \
@@
-193,14
+193,15
@@
private:
void ReloadJsonFile(Builder& builder, Layer& layer)
{
Stage stage = Stage::GetCurrent();
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;
builder = Builder::New();
builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
Property::Map defaultDirs;
- defaultDirs[ TOKEN_STRING(D
ALI_IMAGE_DIR) ] = DALI
_IMAGE_DIR;
- defaultDirs[ TOKEN_STRING(D
ALI_MODEL_DIR) ] = DALI
_MODEL_DIR;
- defaultDirs[ TOKEN_STRING(D
ALI_SCRIPT_DIR) ] = DALI
_SCRIPT_DIR;
+ defaultDirs[ TOKEN_STRING(D
EMO_IMAGE_DIR) ] = DEMO
_IMAGE_DIR;
+ defaultDirs[ TOKEN_STRING(D
EMO_MODEL_DIR) ] = DEMO
_MODEL_DIR;
+ defaultDirs[ TOKEN_STRING(D
EMO_SCRIPT_DIR) ] = DEMO
_SCRIPT_DIR;
builder.AddConstants( defaultDirs );
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);
ExampleApp app(dali_app);
-
if(argc > 1)
{
std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;
if(argc > 1)
{
std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;