Refactored more code into Actor::Relayouter
[platform/core/uifw/dali-core.git] / dali / internal / event / actors / actor-impl.cpp
index 6247000..b201786 100644 (file)
@@ -174,61 +174,122 @@ BaseHandle CreateActor()
   return Dali::Actor::New();
 }
 
-TypeRegistration mType(typeid(Dali::Actor), typeid(Dali::Handle), CreateActor, ActorDefaultProperties);
+/**
+ * Connects a callback function with the object's signals.
+ * @param[in] object The object providing the signal.
+ * @param[in] tracker Used to disconnect the signal.
+ * @param[in] signalName The signal to connect to.
+ * @param[in] functor A newly allocated FunctorDelegate.
+ * @return True if the signal was connected.
+ * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
+ */
+static bool DoConnectSignal(BaseObject*                 object,
+                            ConnectionTrackerInterface* tracker,
+                            const std::string&          signalName,
+                            FunctorDelegate*            functor)
+{
+  bool   connected(true);
+  Actor* actor = static_cast<Actor*>(object); // TypeRegistry guarantees that this is the correct type.
 
-SignalConnectorType signalConnector2(mType, std::string(SIGNAL_HOVERED), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector3(mType, std::string(SIGNAL_WHEEL_EVENT), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector4(mType, std::string(SIGNAL_ON_SCENE), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector5(mType, std::string(SIGNAL_OFF_SCENE), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector6(mType, std::string(SIGNAL_ON_RELAYOUT), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector7(mType, std::string(SIGNAL_TOUCHED), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector8(mType, std::string(SIGNAL_VISIBILITY_CHANGED), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector9(mType, std::string(SIGNAL_LAYOUT_DIRECTION_CHANGED), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector10(mType, std::string(SIGNAL_CHILD_ADDED), &Actor::DoConnectSignal);
-SignalConnectorType signalConnector11(mType, std::string(SIGNAL_CHILD_REMOVED), &Actor::DoConnectSignal);
+  std::string_view name(signalName);
 
-TypeAction a1(mType, std::string(ACTION_SHOW), &Actor::DoAction);
-TypeAction a2(mType, std::string(ACTION_HIDE), &Actor::DoAction);
+  if(name == SIGNAL_HOVERED)
+  {
+    actor->HoveredSignal().Connect(tracker, functor);
+  }
+  else if(signalName == SIGNAL_WHEEL_EVENT)
+  {
+    actor->WheelEventSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_ON_SCENE)
+  {
+    actor->OnSceneSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_OFF_SCENE)
+  {
+    actor->OffSceneSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_ON_RELAYOUT)
+  {
+    actor->OnRelayoutSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_TOUCHED)
+  {
+    actor->TouchedSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_VISIBILITY_CHANGED)
+  {
+    actor->VisibilityChangedSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_LAYOUT_DIRECTION_CHANGED)
+  {
+    actor->LayoutDirectionChangedSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_CHILD_ADDED)
+  {
+    actor->ChildAddedSignal().Connect(tracker, functor);
+  }
+  else if(name == SIGNAL_CHILD_REMOVED)
+  {
+    actor->ChildRemovedSignal().Connect(tracker, functor);
+  }
+  else
+  {
+    // signalName does not match any signal
+    connected = false;
+  }
+
+  return connected;
+}
 
 /**
- * @brief Extract a given dimension from a Vector2
- *
- * @param[in] values The values to extract from
- * @param[in] dimension The dimension to extract
- * @return Return the value for the dimension
+ * Performs actions as requested using the action name.
+ * @param[in] object The object on which to perform the action.
+ * @param[in] actionName The action to perform.
+ * @param[in] attributes The attributes with which to perfrom this action.
+ * @return true if the action was done.
  */
-constexpr float GetDimensionValue(const Vector2& values, Dimension::Type dimension)
+bool DoAction(BaseObject*          object,
+              const std::string&   actionName,
+              const Property::Map& attributes)
 {
-  switch(dimension)
+  bool   done  = false;
+  Actor* actor = dynamic_cast<Actor*>(object);
+
+  if(actor)
   {
-    case Dimension::WIDTH:
-    {
-      return values.width;
-    }
-    case Dimension::HEIGHT:
+    std::string_view name(actionName);
+    if(name == ACTION_SHOW)
     {
-      return values.height;
+      actor->SetVisible(true);
+      done = true;
     }
-    default:
+    else if(name == ACTION_HIDE)
     {
-      break;
+      actor->SetVisible(false);
+      done = true;
     }
   }
-  return 0.0f;
-}
 
-/**
- * @brief Extract a given dimension from a Vector3
- *
- * @param[in] values The values to extract from
- * @param[in] dimension The dimension to extract
- * @return Return the value for the dimension
- */
-float GetDimensionValue(const Vector3& values, Dimension::Type dimension)
-{
-  return GetDimensionValue(values.GetVectorXY(), dimension);
+  return done;
 }
 
+TypeRegistration mType(typeid(Dali::Actor), typeid(Dali::Handle), CreateActor, ActorDefaultProperties);
+
+SignalConnectorType signalConnector2(mType, std::string(SIGNAL_HOVERED), &DoConnectSignal);
+SignalConnectorType signalConnector3(mType, std::string(SIGNAL_WHEEL_EVENT), &DoConnectSignal);
+SignalConnectorType signalConnector4(mType, std::string(SIGNAL_ON_SCENE), &DoConnectSignal);
+SignalConnectorType signalConnector5(mType, std::string(SIGNAL_OFF_SCENE), &DoConnectSignal);
+SignalConnectorType signalConnector6(mType, std::string(SIGNAL_ON_RELAYOUT), &DoConnectSignal);
+SignalConnectorType signalConnector7(mType, std::string(SIGNAL_TOUCHED), &DoConnectSignal);
+SignalConnectorType signalConnector8(mType, std::string(SIGNAL_VISIBILITY_CHANGED), &DoConnectSignal);
+SignalConnectorType signalConnector9(mType, std::string(SIGNAL_LAYOUT_DIRECTION_CHANGED), &DoConnectSignal);
+SignalConnectorType signalConnector10(mType, std::string(SIGNAL_CHILD_ADDED), &DoConnectSignal);
+SignalConnectorType signalConnector11(mType, std::string(SIGNAL_CHILD_REMOVED), &DoConnectSignal);
+
+TypeAction a1(mType, std::string(ACTION_SHOW), &DoAction);
+TypeAction a2(mType, std::string(ACTION_HIDE), &DoAction);
+
 /// Helper for emitting a signal
 template<typename Signal, typename Event>
 bool EmitConsumingSignal(Actor& actor, Signal& signal, const Event& event)
@@ -255,6 +316,35 @@ void EmitSignal(Actor& actor, Signal& signal, Param... params)
   }
 }
 
+using ActorParentSiblingOrderMethod           = void (ActorParent::*)(Actor&);
+using ActorParentSiblingOrderMethodWithTarget = void (ActorParent::*)(Actor&, Actor&);
+
+/// Helper to check and call actor sibling methods in ActorParent
+void CheckParentAndCall(ActorParent* parent, Actor& actor, ActorParentSiblingOrderMethod memberFunction)
+{
+  if(parent)
+  {
+    (parent->*memberFunction)(actor);
+  }
+  else
+  {
+    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
+  }
+}
+
+/// Helper to check and call actor sibling methods with a target parameter in ActorParent
+void CheckParentAndCall(ActorParent* parent, Actor& actor, Actor& target, ActorParentSiblingOrderMethodWithTarget memberFunction)
+{
+  if(parent)
+  {
+    (parent->*memberFunction)(actor, target);
+  }
+  else
+  {
+    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
+  }
+}
+
 } // unnamed namespace
 
 ActorPtr Actor::New()
@@ -446,21 +536,11 @@ const Vector3& Actor::GetCurrentWorldPosition() const
 
 const Vector2 Actor::GetCurrentScreenPosition() const
 {
-  if(mScene && OnScene())
+  if(mScene)
   {
-    Vector3 worldPosition  = GetNode().GetWorldPosition(GetEventThreadServices().GetEventBufferIndex());
-    Vector3 cameraPosition = mScene->GetDefaultCameraActor().GetNode().GetWorldPosition(GetEventThreadServices().GetEventBufferIndex());
-    worldPosition -= cameraPosition;
-
-    Vector3 actorSize = GetCurrentSize() * GetCurrentWorldScale();
-    Vector2 halfSceneSize(mScene->GetSize() * 0.5f); // World position origin is center of scene
-    Vector3 halfActorSize(actorSize * 0.5f);
-    Vector3 anchorPointOffSet = halfActorSize - actorSize * (mPositionUsesAnchorPoint ? GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT);
-
-    return Vector2(halfSceneSize.width + worldPosition.x - anchorPointOffSet.x,
-                   halfSceneSize.height + worldPosition.y - anchorPointOffSet.y);
+    BufferIndex bufferIndex = GetEventThreadServices().GetEventBufferIndex();
+    return CalculateActorScreenPosition(*this, bufferIndex);
   }
-
   return Vector2::ZERO;
 }
 
@@ -693,12 +773,7 @@ void Actor::SetSizeModeFactor(const Vector3& factor)
 
 const Vector3& Actor::GetSizeModeFactor() const
 {
-  if(mRelayoutData)
-  {
-    return mRelayoutData->sizeModeFactor;
-  }
-
-  return Relayouter::DEFAULT_SIZE_MODE_FACTOR;
+  return mRelayoutData ? mRelayoutData->sizeModeFactor : Relayouter::DEFAULT_SIZE_MODE_FACTOR;
 }
 
 void Actor::SetColorMode(ColorMode colorMode)
@@ -898,12 +973,7 @@ void Actor::SetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension
 
 ResizePolicy::Type Actor::GetResizePolicy(Dimension::Type dimension) const
 {
-  if(mRelayoutData)
-  {
-    return mRelayoutData->GetResizePolicy(dimension);
-  }
-
-  return ResizePolicy::DEFAULT;
+  return mRelayoutData ? mRelayoutData->GetResizePolicy(dimension) : ResizePolicy::DEFAULT;
 }
 
 void Actor::SetSizeScalePolicy(SizeScalePolicy::Type policy)
@@ -918,12 +988,7 @@ void Actor::SetSizeScalePolicy(SizeScalePolicy::Type policy)
 
 SizeScalePolicy::Type Actor::GetSizeScalePolicy() const
 {
-  if(mRelayoutData)
-  {
-    return mRelayoutData->sizeSetPolicy;
-  }
-
-  return Relayouter::DEFAULT_SIZE_SCALE_POLICY;
+  return mRelayoutData ? mRelayoutData->sizeSetPolicy : Relayouter::DEFAULT_SIZE_SCALE_POLICY;
 }
 
 void Actor::SetDimensionDependency(Dimension::Type dimension, Dimension::Type dependency)
@@ -933,12 +998,7 @@ void Actor::SetDimensionDependency(Dimension::Type dimension, Dimension::Type de
 
 Dimension::Type Actor::GetDimensionDependency(Dimension::Type dimension) const
 {
-  if(mRelayoutData)
-  {
-    return mRelayoutData->GetDimensionDependency(dimension);
-  }
-
-  return Dimension::ALL_DIMENSIONS; // Default
+  return mRelayoutData ? mRelayoutData->GetDimensionDependency(dimension) : Dimension::ALL_DIMENSIONS;
 }
 
 void Actor::SetRelayoutEnabled(bool relayoutEnabled)
@@ -1137,62 +1197,6 @@ DevelActor::ChildOrderChangedSignalType& Actor::ChildOrderChangedSignal()
   return mParentImpl.ChildOrderChangedSignal();
 }
 
-bool Actor::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
-{
-  bool   connected(true);
-  Actor* actor = static_cast<Actor*>(object); // TypeRegistry guarantees that this is the correct type.
-
-  std::string_view name(signalName);
-
-  if(name == SIGNAL_HOVERED)
-  {
-    actor->HoveredSignal().Connect(tracker, functor);
-  }
-  else if(signalName == SIGNAL_WHEEL_EVENT)
-  {
-    actor->WheelEventSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_ON_SCENE)
-  {
-    actor->OnSceneSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_OFF_SCENE)
-  {
-    actor->OffSceneSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_ON_RELAYOUT)
-  {
-    actor->OnRelayoutSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_TOUCHED)
-  {
-    actor->TouchedSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_VISIBILITY_CHANGED)
-  {
-    actor->VisibilityChangedSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_LAYOUT_DIRECTION_CHANGED)
-  {
-    actor->LayoutDirectionChangedSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_CHILD_ADDED)
-  {
-    actor->ChildAddedSignal().Connect(tracker, functor);
-  }
-  else if(name == SIGNAL_CHILD_REMOVED)
-  {
-    actor->ChildRemovedSignal().Connect(tracker, functor);
-  }
-  else
-  {
-    // signalName does not match any signal
-    connected = false;
-  }
-
-  return connected;
-}
-
 Actor::Actor(DerivedType derivedType, const SceneGraph::Node& node)
 : Object(&node),
   mParentImpl(*this),
@@ -1583,74 +1587,32 @@ const SceneGraph::Node& Actor::GetNode() const
 
 void Actor::Raise()
 {
-  if(mParent)
-  {
-    mParent->RaiseChild(*this);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, &ActorParent::RaiseChild);
 }
 
 void Actor::Lower()
 {
-  if(mParent)
-  {
-    mParent->LowerChild(*this);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, &ActorParent::LowerChild);
 }
 
 void Actor::RaiseToTop()
 {
-  if(mParent)
-  {
-    mParent->RaiseChildToTop(*this);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, &ActorParent::RaiseChildToTop);
 }
 
 void Actor::LowerToBottom()
 {
-  if(mParent)
-  {
-    mParent->LowerChildToBottom(*this);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, &ActorParent::LowerChildToBottom);
 }
 
 void Actor::RaiseAbove(Internal::Actor& target)
 {
-  if(mParent)
-  {
-    mParent->RaiseChildAbove(*this, target);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, target, &ActorParent::RaiseChildAbove);
 }
 
 void Actor::LowerBelow(Internal::Actor& target)
 {
-  if(mParent)
-  {
-    mParent->LowerChildBelow(*this, target);
-  }
-  else
-  {
-    DALI_LOG_WARNING("Actor must have a parent, Sibling order not changed.\n");
-  }
+  CheckParentAndCall(mParent, *this, target, &ActorParent::LowerChildBelow);
 }
 
 void Actor::SetParent(ActorParent* parent, bool notify)
@@ -1693,46 +1655,16 @@ void Actor::SetParent(ActorParent* parent, bool notify)
   }
 }
 
-bool Actor::DoAction(BaseObject* object, const std::string& actionName, const Property::Map& /* attributes */)
-{
-  bool   done  = false;
-  Actor* actor = dynamic_cast<Actor*>(object);
-
-  if(actor)
-  {
-    std::string_view name(actionName);
-    if(name == ACTION_SHOW)
-    {
-      actor->SetVisible(true);
-      done = true;
-    }
-    else if(name == ACTION_HIDE)
-    {
-      actor->SetVisible(false);
-      done = true;
-    }
-  }
-
-  return done;
-}
-
 Rect<> Actor::CalculateScreenExtents() const
 {
-  auto    screenPosition    = GetCurrentScreenPosition();
-  Vector3 size              = GetCurrentSize() * GetCurrentWorldScale();
-  Vector3 anchorPointOffSet = size * (mPositionUsesAnchorPoint ? GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT);
-  Vector2 position          = Vector2(screenPosition.x - anchorPointOffSet.x, screenPosition.y - anchorPointOffSet.y);
-  return {position.x, position.y, size.x, size.y};
+  auto        screenPosition = GetCurrentScreenPosition();
+  BufferIndex bufferIndex    = GetEventThreadServices().GetEventBufferIndex();
+  return CalculateActorScreenExtents(*this, screenPosition, bufferIndex);
 }
 
-void Actor::SetNeedGesturePropagation(bool propagation)
+Vector3 Actor::GetAnchorPointForPosition() const
 {
-  mNeedGesturePropagation = propagation;
-}
-
-bool Actor::NeedGesturePropagation()
-{
-  return mNeedGesturePropagation;
+  return (mPositionUsesAnchorPoint ? GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT);
 }
 
 bool Actor::GetCachedPropertyValue(Property::Index index, Property::Value& value) const
@@ -1758,47 +1690,12 @@ Actor::Relayouter& Actor::EnsureRelayouter()
 
 bool Actor::RelayoutDependentOnParent(Dimension::Type dimension)
 {
-  // Check if actor is dependent on parent
-  for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
-  {
-    if((dimension & (1 << i)))
-    {
-      const ResizePolicy::Type resizePolicy = GetResizePolicy(static_cast<Dimension::Type>(1 << i));
-      if(resizePolicy == ResizePolicy::FILL_TO_PARENT || resizePolicy == ResizePolicy::SIZE_RELATIVE_TO_PARENT || resizePolicy == ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT)
-      {
-        return true;
-      }
-    }
-  }
-
-  return false;
+  return mRelayoutData && mRelayoutData->GetRelayoutDependentOnParent(dimension);
 }
 
 bool Actor::RelayoutDependentOnChildren(Dimension::Type dimension)
 {
-  // Check if actor is dependent on children
-  for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
-  {
-    if((dimension & (1 << i)))
-    {
-      const ResizePolicy::Type resizePolicy = GetResizePolicy(static_cast<Dimension::Type>(1 << i));
-      switch(resizePolicy)
-      {
-        case ResizePolicy::FIT_TO_CHILDREN:
-        case ResizePolicy::USE_NATURAL_SIZE: // i.e. For things that calculate their size based on children
-        {
-          return true;
-        }
-
-        default:
-        {
-          break;
-        }
-      }
-    }
-  }
-
-  return false;
+  return mRelayoutData && mRelayoutData->GetRelayoutDependentOnChildren(dimension);
 }
 
 bool Actor::RelayoutDependentOnChildrenBase(Dimension::Type dimension)
@@ -1808,41 +1705,20 @@ bool Actor::RelayoutDependentOnChildrenBase(Dimension::Type dimension)
 
 bool Actor::RelayoutDependentOnDimension(Dimension::Type dimension, Dimension::Type dependentDimension)
 {
-  // Check each possible dimension and see if it is dependent on the input one
-  for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
-  {
-    if(dimension & (1 << i))
-    {
-      return mRelayoutData->resizePolicies[i] == ResizePolicy::DIMENSION_DEPENDENCY && mRelayoutData->dimensionDependencies[i] == dependentDimension;
-    }
-  }
-
-  return false;
+  return mRelayoutData && mRelayoutData->GetRelayoutDependentOnDimension(dimension, dependentDimension);
 }
 
 void Actor::SetNegotiatedDimension(float negotiatedDimension, Dimension::Type dimension)
 {
-  for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
+  if(mRelayoutData)
   {
-    if(dimension & (1 << i))
-    {
-      mRelayoutData->negotiatedDimensions[i] = negotiatedDimension;
-    }
+    mRelayoutData->SetNegotiatedDimension(negotiatedDimension, dimension);
   }
 }
 
 float Actor::GetNegotiatedDimension(Dimension::Type dimension) const
 {
-  // If more than one dimension is requested, just return the first one found
-  for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
-  {
-    if((dimension & (1 << i)))
-    {
-      return mRelayoutData->negotiatedDimensions[i];
-    }
-  }
-
-  return 0.0f; // Default
+  return mRelayoutData ? mRelayoutData->GetNegotiatedDimension(dimension) : 0.0f;
 }
 
 void Actor::SetPadding(const Vector2& padding, Dimension::Type dimension)
@@ -1852,19 +1728,7 @@ void Actor::SetPadding(const Vector2& padding, Dimension::Type dimension)
 
 Vector2 Actor::GetPadding(Dimension::Type dimension) const
 {
-  if(mRelayoutData)
-  {
-    // If more than one dimension is requested, just return the first one found
-    for(uint32_t i = 0; i < Dimension::DIMENSION_COUNT; ++i)
-    {
-      if((dimension & (1 << i)))
-      {
-        return mRelayoutData->dimensionPadding[i];
-      }
-    }
-  }
-
-  return Relayouter::DEFAULT_DIMENSION_PADDING;
+  return mRelayoutData ? mRelayoutData->GetPadding(dimension) : Relayouter::DEFAULT_DIMENSION_PADDING;
 }
 
 void Actor::SetLayoutNegotiated(bool negotiated, Dimension::Type dimension)
@@ -1891,29 +1755,7 @@ float Actor::GetWidthForHeightBase(float height)
 
 float Actor::CalculateChildSizeBase(const Dali::Actor& child, Dimension::Type dimension)
 {
-  // Fill to parent, taking size mode factor into account
-  switch(child.GetResizePolicy(dimension))
-  {
-    case ResizePolicy::FILL_TO_PARENT:
-    {
-      return GetLatestSize(dimension);
-    }
-
-    case ResizePolicy::SIZE_RELATIVE_TO_PARENT:
-    {
-      return GetLatestSize(dimension) * GetDimensionValue(child.GetProperty<Vector3>(Dali::Actor::Property::SIZE_MODE_FACTOR), dimension);
-    }
-
-    case ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT:
-    {
-      return GetLatestSize(dimension) + GetDimensionValue(child.GetProperty<Vector3>(Dali::Actor::Property::SIZE_MODE_FACTOR), dimension);
-    }
-
-    default:
-    {
-      return GetLatestSize(dimension);
-    }
-  }
+  return Actor::Relayouter::CalculateChildSize(*this, GetImplementation(child), dimension);
 }
 
 float Actor::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
@@ -1948,103 +1790,27 @@ float Actor::GetRelayoutSize(Dimension::Type dimension) const
 
 float Actor::NegotiateFromParent(Dimension::Type dimension)
 {
-  Actor* parent = GetParent();
-  if(parent)
-  {
-    Vector2 padding(GetPadding(dimension));
-    Vector2 parentPadding(parent->GetPadding(dimension));
-    return parent->CalculateChildSize(Dali::Actor(this), dimension) - parentPadding.x - parentPadding.y - padding.x - padding.y;
-  }
-
-  return 0.0f;
+  return Relayouter::NegotiateDimensionFromParent(*this, dimension);
 }
 
 float Actor::NegotiateFromChildren(Dimension::Type dimension)
 {
-  float maxDimensionPoint = 0.0f;
-
-  for(uint32_t i = 0, count = GetChildCount(); i < count; ++i)
-  {
-    ActorPtr child = GetChildAt(i);
-
-    if(!child->RelayoutDependentOnParent(dimension))
-    {
-      // Calculate the min and max points that the children range across
-      float childPosition = GetDimensionValue(child->GetTargetPosition(), dimension);
-      float dimensionSize = child->GetRelayoutSize(dimension);
-      maxDimensionPoint   = std::max(maxDimensionPoint, childPosition + dimensionSize);
-    }
-  }
-
-  return maxDimensionPoint;
+  return Relayouter::NegotiateDimensionFromChildren(*this, dimension);
 }
 
 float Actor::GetSize(Dimension::Type dimension) const
 {
-  return GetDimensionValue(mTargetSize, dimension);
+  return Relayouter::GetDimensionValue(mTargetSize, dimension);
 }
 
 float Actor::GetNaturalSize(Dimension::Type dimension) const
 {
-  return GetDimensionValue(GetNaturalSize(), dimension);
+  return Relayouter::GetDimensionValue(GetNaturalSize(), dimension);
 }
 
 float Actor::CalculateSize(Dimension::Type dimension, const Vector2& maximumSize)
 {
-  switch(GetResizePolicy(dimension))
-  {
-    case ResizePolicy::USE_NATURAL_SIZE:
-    {
-      return GetNaturalSize(dimension);
-    }
-
-    case ResizePolicy::FIXED:
-    {
-      return GetDimensionValue(GetPreferredSize(), dimension);
-    }
-
-    case ResizePolicy::USE_ASSIGNED_SIZE:
-    {
-      return GetDimensionValue(maximumSize, dimension);
-    }
-
-    case ResizePolicy::FILL_TO_PARENT:
-    case ResizePolicy::SIZE_RELATIVE_TO_PARENT:
-    case ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT:
-    {
-      return NegotiateFromParent(dimension);
-    }
-
-    case ResizePolicy::FIT_TO_CHILDREN:
-    {
-      return NegotiateFromChildren(dimension);
-    }
-
-    case ResizePolicy::DIMENSION_DEPENDENCY:
-    {
-      const Dimension::Type dimensionDependency = GetDimensionDependency(dimension);
-
-      // Custom rules
-      if(dimension == Dimension::WIDTH && dimensionDependency == Dimension::HEIGHT)
-      {
-        return GetWidthForHeight(GetNegotiatedDimension(Dimension::HEIGHT));
-      }
-
-      if(dimension == Dimension::HEIGHT && dimensionDependency == Dimension::WIDTH)
-      {
-        return GetHeightForWidth(GetNegotiatedDimension(Dimension::WIDTH));
-      }
-
-      break;
-    }
-
-    default:
-    {
-      break;
-    }
-  }
-
-  return 0.0f; // Default
+  return Relayouter::CalculateSize(*this, dimension, maximumSize);
 }
 
 Vector2 Actor::ApplySizeSetPolicy(const Vector2& size)