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
Cache fallback font lists for each requested font
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support-impl.cpp
diff --git
a/dali-toolkit/internal/text/multi-language-support-impl.cpp
b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index
8e55537
..
37cf040
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/
dali-toolkit/internal/text/multi-language-support-impl.cpp
@@
-428,6
+428,7
@@
void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
// Whether the font being validated is a default one not set by the user.
const bool isDefault = ( 0u == fontId );
// Whether the font being validated is a default one not set by the user.
const bool isDefault = ( 0u == fontId );
+ FontId preferredFont = fontId;
DALI_LOG_INFO( gLogFilter,
Debug::Verbose,
DALI_LOG_INFO( gLogFilter,
Debug::Verbose,
@@
-525,8
+526,8
@@
void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
// Emojis are present in many monochrome fonts; prefer color by default.
bool preferColor = ( TextAbstraction::EMOJI == script );
// Emojis are present in many monochrome fonts; prefer color by default.
bool preferColor = ( TextAbstraction::EMOJI == script );
- // Find a
default
font.
- fontId = fontClient.Find
DefaultFont(
character, pointSize, preferColor );
+ // Find a
fallback-
font.
+ fontId = fontClient.Find
FallbackFont( preferredFont,
character, pointSize, preferColor );
// If the system does not support a suitable font, fallback to Latin
if( 0u == fontId )
// If the system does not support a suitable font, fallback to Latin
if( 0u == fontId )