[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / controller / text-controller-impl-model-updater.cpp

diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
index ab005b1..fb4eb5f 100644 (file)
--- a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/text/controller/text-controller-impl-model-updater.h>
 
 // EXTERNAL INCLUDES
+#include <chrono>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/trace.h>
 #include <dali/public-api/math/math-utils.h>
@@ -261,7 +262,7 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
         // Set the normal font and the placeholder font.
         defaultFontDescription = impl.mFontDefaults->mFontDescription;
 
-        if(impl.mTextFitEnabled)
+        if(impl.mTextFitEnabled || impl.mTextFitArrayEnabled)
         {
           defaultPointSize = impl.mFontDefaults->mFitPointSize * numberOfPointsPerOneUnitOfPointSize;
         }