From 9012617eed6ae42908bbb15363cc9db49af44e2d Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Thu, 16 Jun 2022 11:16:34 +0900 Subject: [PATCH] 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 --- dali-toolkit/internal/text/text-controller-relayouter.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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(operationsPending | requestedOperationsMask); - } + // Layout the text for the new width. + operationsPending = static_cast(operationsPending | requestedOperationsMask); DoRelayout(impl, requestedControllerSize, -- 2.7.4