projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Added actor creation from json snippet" into tizen
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/base/dali-toolkit/internal/builder/builder-impl.cpp
b/base/dali-toolkit/internal/builder/builder-impl.cpp
index
6deedb5
..
31def0e
100644
(file)
--- a/
base/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
base/dali-toolkit/internal/builder/builder-impl.cpp
@@
-507,9
+507,7
@@
BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
}
}
}
}
- ApplyProperties( root, node, handle, replacements );
-
- if( actor)
+ if( actor )
{
// add children of all the styles
if( OptionalChild actors = IsChild( node, KEYNAME_ACTORS ) )
{
// add children of all the styles
if( OptionalChild actors = IsChild( node, KEYNAME_ACTORS ) )
@@
-529,7
+527,10
@@
BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
parent.Add( actor );
}
}
parent.Add( actor );
}
}
-
+ else
+ {
+ ApplyProperties( root, node, handle, replacements );
+ }
}
else
{
}
else
{