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 "(Vector) Ensure that all animation data is applied at once" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-set-property.cpp
diff --git
a/dali-toolkit/internal/builder/builder-set-property.cpp
b/dali-toolkit/internal/builder/builder-set-property.cpp
index
93a1fbe
..
367c527
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/
dali-toolkit/internal/builder/builder-set-property.cpp
@@
-97,6
+97,10
@@
bool Disambiguated(const TreeNode& child,
{
return DeterminePropertyFromNode( *childValue, Dali::Property::ARRAY, value, replacement);
}
{
return DeterminePropertyFromNode( *childValue, Dali::Property::ARRAY, value, replacement);
}
+ else if(*childType == "extents")
+ {
+ return DeterminePropertyFromNode( *childValue, Dali::Property::EXTENTS, value, replacement);
+ }
}
// else we failed to disambiguate
}
// else we failed to disambiguate
@@
-317,6
+321,15
@@
bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Prope
}
break;
}
}
break;
}
+ case Property::EXTENTS:
+ {
+ if( OptionalExtents v = replacer.IsExtents(node) )
+ {
+ value = *v;
+ done = true;
+ }
+ break;
+ }
case Property::NONE:
{
break;
case Property::NONE:
{
break;