Refactored actor size negotiation

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / dali-test-suite-utils / test-custom-actor.cpp

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
index db6cfca..8fff834 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
@@ -149,17 +149,17 @@ Vector3 TestCustomActor::GetTargetSize()
 
 Vector3 TestCustomActor::GetNaturalSize()
 {
-  return Vector3(0.0f, 0.0f, 0.0f);
+  return GetImpl().GetNaturalSize();
 }
 
 float TestCustomActor::GetHeightForWidth(float width)
 {
-  return 0.0f;
+  return GetImpl().GetHeightForWidth(width);
 }
 
 float TestCustomActor::GetWidthForHeight(float height)
 {
-  return 0.0f;
+  return GetImpl().GetWidthForHeight(height);
 }
 
 void TestCustomActor::OnRelayout(const Vector2& size, RelayoutContainer& container)
@@ -356,17 +356,21 @@ void TestCustomActor::OnKeyInputFocusLost()
 }
 Vector3 TestCustomActor::GetNaturalSize()
 {
-  return Vector3(0.0f, 0.0f, 0.0f);
+  return mNaturalSize;
+}
+void TestCustomActor::SetNaturalSize(const Vector3& size)
+{
+  mNaturalSize = size;
 }
 
 float TestCustomActor::GetHeightForWidth(float width)
 {
-  return 0.0f;
+  return mH4Wfactor * width;
 }
 
 float TestCustomActor::GetWidthForHeight(float height)
 {
-  return 0.0f;
+  return mW4Hfactor * height;
 }
 
 void TestCustomActor::OnRelayout(const Vector2& size, RelayoutContainer& container)
@@ -384,7 +388,7 @@ void TestCustomActor::OnCalculateRelayoutSize(Dimension::Type dimension)
 
 float TestCustomActor::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
 {
-  return 0.0f;
+  return CustomActorImpl::CalculateChildSizeBase(child, dimension);
 }
 
 void TestCustomActor::OnLayoutNegotiated(float size, Dimension::Type dimension)
@@ -393,7 +397,7 @@ void TestCustomActor::OnLayoutNegotiated(float size, Dimension::Type dimension)
 
 bool TestCustomActor::RelayoutDependentOnChildren(Dimension::Type dimension)
 {
-  return false;
+  return CustomActorImpl::RelayoutDependentOnChildrenBase(dimension);
 }
 
 void TestCustomActor::SetTransparent(bool transparent)