fix incorrect calculaion of natural size in text

In DoRelayout of GetNaturalSize/GetHeightForWidth,
operationsPending should inlcude LAYOUT.
Without this, incorrect size calculations will occur.

Change-Id: I4cfcf392d07eac2b5929b7b2cc36d08c8fc519a8
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>

diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp
index b9b4f56..527bb99 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp
@@ -93,11 +93,8 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control
   {
     impl.UpdateModel(onlyOnceOperations);
 
   {
     impl.UpdateModel(onlyOnceOperations);
 

-    if(impl.mIsAutoScrollEnabled)
-    {
-      // Layout the text for the new width.
-      operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask);
-    }
+    // Layout the text for the new width.
+    operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask);

 
     DoRelayout(impl,
                requestedControllerSize,
 
     DoRelayout(impl,
                requestedControllerSize,