projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.28] 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
958d663
..
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
@@
-262,7
+262,7
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
// Set the normal font and the placeholder font.
defaultFontDescription = impl.mFontDefaults->mFontDescription;
// 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;
}
{
defaultPointSize = impl.mFontDefaults->mFitPointSize * numberOfPointsPerOneUnitOfPointSize;
}