Force the actors in the relayout container to do a size negotiation

Change-Id: I52f7d2752ddf0f33629901fb3504580d6c64bb15

diff --git a/dali/internal/event/size-negotiation/relayout-controller-impl.cpp b/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
index 9efe523..0d6b927 100644 (file)
--- a/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
+++ b/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
@@ -479,6 +479,17 @@ void RelayoutController::Relayout()
 
           // 3. Negotiate the size with the current actor. Pass it an empty container which the actor
           //    has to fill with all the actors it has not done any size negotiation for.
+
+          // Force the actor in the relayout container to do a size negotiation
+          if(actorImpl.GetResizePolicy(Dimension::WIDTH) == ResizePolicy::USE_ASSIGNED_SIZE)
+          {
+            actorImpl.SetLayoutNegotiated(false, Dimension::WIDTH);
+          }
+          if(actorImpl.GetResizePolicy(Dimension::HEIGHT) == ResizePolicy::USE_ASSIGNED_SIZE)
+          {
+            actorImpl.SetLayoutNegotiated(false, Dimension::HEIGHT);
+          }
+
           actorImpl.NegotiateSize( size, *mRelayoutStack );
         }
       }