Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-adaptor.git] / adaptors / common / style-monitor-impl.cpp

diff --git a/adaptors/common/style-monitor-impl.cpp b/adaptors/common/style-monitor-impl.cpp
index beafbe3..756df14 100644 (file)
--- a/adaptors/common/style-monitor-impl.cpp
+++ b/adaptors/common/style-monitor-impl.cpp
@@ -18,8 +18,10 @@
 // CLASS HEADER
 #include "style-monitor-impl.h"
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
 #include <adaptor-impl.h>
 #include <singleton-service-impl.h>
 
@@ -77,8 +79,11 @@ Dali::StyleMonitor StyleMonitor::Get()
 }
 
 StyleMonitor::StyleMonitor(Integration::PlatformAbstraction& platformAbstraction)
-: mPlatformAbstraction(platformAbstraction)
+: mPlatformAbstraction(platformAbstraction),
+  mDefaultFontSize(-1)
 {
+  mPlatformAbstraction.GetDefaultFontDescription( mDefaultFontFamily, mDefaultFontStyle );
+  mDefaultFontSize = mPlatformAbstraction.GetDefaultFontSize();
 }
 
 StyleMonitor::~StyleMonitor()
@@ -87,9 +92,13 @@ StyleMonitor::~StyleMonitor()
 
 void StyleMonitor::StyleChanged(StyleChange styleChange)
 {
-  if (styleChange.defaultFontChange || styleChange.defaultFontSizeChange)
+  if ( styleChange.defaultFontChange )
+  {
+    mPlatformAbstraction.GetDefaultFontDescription( mDefaultFontFamily, mDefaultFontStyle );
+  }
+  if ( styleChange.defaultFontSizeChange )
   {
-    //mPlatformAbstraction.UpdateDefaultsFromDevice();
+    mDefaultFontSize = mPlatformAbstraction.GetDefaultFontSize();
   }
 
   EmitStyleChangeSignal(styleChange);
@@ -97,14 +106,17 @@ void StyleMonitor::StyleChanged(StyleChange styleChange)
 
 std::string StyleMonitor::GetDefaultFontFamily() const
 {
-  //return mPlatformAbstraction.GetDefaultFontFamily();
-  return std::string();
+  return mDefaultFontFamily;
+}
+
+std::string StyleMonitor::GetDefaultFontStyle() const
+{
+  return mDefaultFontStyle;
 }
 
-float StyleMonitor::GetDefaultFontSize() const
+int StyleMonitor::GetDefaultFontSize() const
 {
-  //return mPlatformAbstraction.GetDefaultFontSize();
-  return float();
+  return mDefaultFontSize;
 }
 
 const std::string& StyleMonitor::GetTheme() const
@@ -122,17 +134,17 @@ void StyleMonitor::SetTheme(const std::string& path)
   EmitStyleChangeSignal(styleChange);
 }
 
-Dali::StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal()
+Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
 {
-  return mStyleChangeSignalV2;
+  return mStyleChangeSignal;
 }
 
 void StyleMonitor::EmitStyleChangeSignal(StyleChange styleChange)
 {
-  if( !mStyleChangeSignalV2.Empty() )
+  if( !mStyleChangeSignal.Empty() )
   {
     Dali::StyleMonitor handle( this );
-    mStyleChangeSignalV2.Emit( handle, styleChange );
+    mStyleChangeSignal.Emit( handle, styleChange );
   }
 }