From 04389e80b8cc630e33042923432d2d8ddb435f6f Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Thu, 17 Sep 2015 19:08:25 +0100
Subject: [PATCH] Cache fallback font lists for each requested font
Change-Id: I0b05f4e9a2495fea62bde613f716f2727a9e4251
---
dali-toolkit/internal/text/multi-language-support-impl.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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
--- 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& text,
// 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,
@@ -525,8 +526,8 @@ void MultilanguageSupport::ValidateFonts( const Vector& text,
// Emojis are present in many monochrome fonts; prefer color by default.
bool preferColor = ( TextAbstraction::EMOJI == script );
- // Find a default font.
- fontId = fontClient.FindDefaultFont( character, pointSize, preferColor );
+ // Find a fallback-font.
+ fontId = fontClient.FindFallbackFont( preferredFont, character, pointSize, preferColor );
// If the system does not support a suitable font, fallback to Latin
if( 0u == fontId )
--
2.7.4