From: joogab yun <joogab.yun@samsung.com>
Date: Thu, 16 Jun 2022 07:25:39 +0000 (+0000)
Subject: Merge "It may be outside the range of type int. Change to uint64_t." into devel/master
X-Git-Tag: dali_2.1.27~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6971d8bc50e36b3b7d62ad07355b41d3fe41af58;hp=cb2229846d61445fdaff58fd5521dc3fb36e7676

Merge "It may be outside the range of type int. Change to uint64_t." into devel/master
---

diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp
index b9b4f56..527bb99 100644
--- 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);
 
-    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,