Prefer color Emoji by default

Change-Id: Ic73eb25ce7c9ee2635db9becfe5779111f4a2f83

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 6e41ae3..4c68a74 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -505,8 +505,11 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
       // If the cache has not a default font, get one from the font client.
       if( 0u == fontId )
       {
       // If the cache has not a default font, get one from the font client.
       if( 0u == fontId )
       {

+        // Emojis are present in many monochrome fonts; prefer color by default.
+        bool preferColor = ( TextAbstraction::EMOJI == script );
+

         // Find a default font.
         // Find a default font.

-        fontId = fontClient.FindDefaultFont( character, pointSize );
+        fontId = fontClient.FindDefaultFont( 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 )