From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Thu, 16 Jun 2022 02:16:34 +0000 (+0900)
Subject: [Tizen] fix incorrect calculaion of natural size in text
X-Git-Tag: accepted/tizen/6.5/unified/20220629.152606^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F94%2F276394%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen] 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: I7fd1bca412325772ddc24b3ab36753b82a08e7de
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 742089c..bd1c5b2 100644
--- a/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp
@@ -92,11 +92,8 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control
   {
     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(controller,
                requestedControllerSize,