Add a condition to ensure FontClient

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / styling / style-manager-impl.cpp

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index e6ad82f..8cd7ba5 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -118,7 +118,6 @@ StyleManager::StyleManager()
   if(mStyleMonitor)
   {
     mStyleMonitor.StyleChangeSignal().Connect(this, &StyleManager::StyleMonitorChange);
-    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
   }
 
   // Set the full path for the default style theme.
@@ -471,6 +470,11 @@ void StyleManager::ApplyStyle(Toolkit::Builder builder, Toolkit::Control control
     builder.ApplyStyle(styleName, control);
   }
 
+  if(mDefaultFontSize == -1 && mStyleMonitor.EnsureFontClientCreated())
+  {
+    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
+  }
+
   if(mDefaultFontSize >= 0)
   {
     // Apply the style for logical font size