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
Merged with Tizen Branch ( builds )
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
202e944
..
a6c74b0
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-278,7
+278,7
@@
void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
// special field 'effect' references the shader effect instances
if(key == "effect")
{
// special field 'effect' references the shader effect instances
if(key == "effect")
{
-
RenderableActor actor = Renderabl
eActor::DownCast(handle);
+
ImageActor actor = Imag
eActor::DownCast(handle);
if( actor )
{
OptionalString str = constant.IsString( keyChild.second );
if( actor )
{
OptionalString str = constant.IsString( keyChild.second );
@@
-302,7
+302,7
@@
void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
if( Property::INVALID_INDEX == index )
{
if( Property::INVALID_INDEX == index )
{
-
RenderableActor actor = Renderabl
eActor::DownCast(handle);
+
ImageActor actor = Imag
eActor::DownCast(handle);
if( actor )
{
if( ShaderEffect effect = actor.GetShaderEffect() )
if( actor )
{
if( ShaderEffect effect = actor.GetShaderEffect() )
@@
-534,9
+534,6
@@
BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
if( actor )
{
if( actor )
{
- // TEMP: Assume all script created actors are not using size negotiation for now
- actor.SetRelayoutEnabled( false );
-
// 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 ) )
{