From: Richard Huang <r.huang@samsung.com>
Date: Mon, 29 Feb 2016 17:35:21 +0000 (+0000)
Subject: Force the actors in the relayout container to do a size negotiation
X-Git-Tag: dali_1.1.24~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=805869e5d222f4c49c655564c7574e06beb0fcf3;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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
--- 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 );
         }
       }