[4.0] Support custom fonts registration

This reverts commit 1ccb7aaa44a36b39f4591fc4cd9673637c91a675.

Change-Id: I4bbda02028e9f97050f01cba68b378e8a40c26d2

diff --git a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
index 07d657f..8fe2812 100644 (file)
--- a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
+++ b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
@@ -1309,7 +1309,8 @@ int UtcDaliStyleManagerConfigSectionTest(void)
     "  \"config\":\n"
     "  {\n"
     "    \"alwaysShowFocus\":false,\n"
-    "    \"clearFocusOnEscape\":false\n"
+    "    \"clearFocusOnEscape\":false,\n"
+    "    \"customFontDirectory\":\"" DALI_STYLE_DIR "\"\n"
     "  },\n"
     "  \"styles\":\n"
     "  {\n"
@@ -1327,9 +1328,12 @@ int UtcDaliStyleManagerConfigSectionTest(void)
   DALI_TEST_CHECK( !alwaysShowFocus );
   bool clearFocusOnEscape = config["clearFocusOnEscape"].Get<bool>();
   DALI_TEST_CHECK( !clearFocusOnEscape );
+  std::string customFontDirectory = config["customFontDirectory"].Get<std::string>();
+  DALI_TEST_EQUALS( customFontDirectory, DALI_STYLE_DIR, TEST_LOCATION );
 
   // For coverage
   Toolkit::TextEditor editor = Toolkit::TextEditor::New();
+  editor.SetProperty( TextEditor::Property::TEXT, "Test" );
   editor.SetKeyboardFocusable( true );
   Stage::GetCurrent().Add( editor );
 

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index e88a286..d32809c 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -25,6 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/multi-language-helper-functions.h>
+#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 
 namespace Dali
 {
@@ -106,6 +107,20 @@ MultilanguageSupport::MultilanguageSupport()
   // Initializes the valid fonts cache to NULL (no valid fonts).
   // Reserves space to cache the valid fonts and access them with the script as an index.
   mValidFontsPerScriptCache.Resize( TextAbstraction::UNKNOWN, NULL );
+
+  // Add custom font directory
+  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
+  if( styleManager )
+  {
+    std::string path;
+    Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager );
+    if( config["customFontDirectory"].Get( path ) )
+    {
+      TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+      fontClient.AddCustomFontDirectory( path.c_str() );
+    }
+  }
+
 }
 
 MultilanguageSupport::~MultilanguageSupport()