Merge "Fixes Drop Shadow Frustum Culling." into devel/new_mesh
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 16 Jun 2015 13:52:37 +0000 (06:52 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 16 Jun 2015 13:52:38 +0000 (06:52 -0700)
dali-toolkit/public-api/controls/control-impl.cpp

index 1d1e5b0..5d9880b 100644 (file)
@@ -1073,15 +1073,23 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime
 
 Vector3 Control::GetNaturalSize()
 {
+  //Control's natural size is the size of its background image if it has been set, or ZERO otherwise
+  Vector3 naturalSize = Vector3::ZERO;
   if( mImpl->mBackground )
   {
-    Actor actor = mImpl->mBackground->actor;
-    if( actor )
+    Material backgroundMaterial = mImpl->mBackground->actor.GetRendererAt(0).GetMaterial();
+    if( backgroundMaterial.GetNumberOfSamplers() > 0 )
     {
-      return actor.GetNaturalSize();
+      Image backgroundImage =  backgroundMaterial.GetSamplerAt(0).GetImage();
+      if( backgroundImage )
+      {
+        naturalSize.x = backgroundImage.GetWidth();
+        naturalSize.y = backgroundImage.GetHeight();
+      }
     }
   }
-  return Vector3();
+
+  return naturalSize;
 }
 
 float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )