Merge "Add MARGIN and PADDING property in Control" 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);
     }
+    else if(*childType == "extents")
+    {
+      return DeterminePropertyFromNode( *childValue, Dali::Property::EXTENTS, value, replacement);
+    }
   }
 
   // else we failed to disambiguate
@@ -317,6 +321,15 @@ bool DeterminePropertyFromNode( const TreeNode& node, Property::Type type, Prope
       }
       break;
     }
+    case Property::EXTENTS:
+    {
+      if( OptionalExtents v = replacer.IsExtents(node) )
+      {
+        value = *v;
+        done = true;
+      }
+      break;
+    }
     case Property::NONE:
     {
       break;