System font family change to update font in TextField

[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 c245c15..41f20e3 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -100,6 +100,7 @@ Toolkit::StyleManager StyleManager::Get()
 StyleManager::StyleManager()
 : mOrientationDegrees( 0 ),  // Portrait
   mDefaultFontSize( -1 ),
+  mDefaultFontFamily(""),
   mThemeFile( DEFAULT_THEME ),
   mFeedbackStyle( NULL )
 {
@@ -155,6 +156,11 @@ void StyleManager::SetOrientation( Orientation orientation )
   }
 }
 
+std::string StyleManager::GetDefaultFontFamily() const
+{
+  return mDefaultFontFamily;
+}
+
 Orientation StyleManager::GetOrientation()
 {
   return mOrientation;
@@ -303,10 +309,7 @@ void StyleManager::ApplyThemeStyle( Toolkit::Control control )
 
 void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control )
 {
-  if( mThemeBuilder )
-  {
-    ApplyStyle( mThemeBuilder, control );
-  }
+  ApplyThemeStyle( control );
 
   if(mFeedbackStyle)
   {
@@ -420,6 +423,7 @@ void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::T
   {
     case StyleChange::DEFAULT_FONT_CHANGE:
     {
+      mDefaultFontFamily = styleMonitor.GetDefaultFontFamily();
       break;
     }