Merge branch 'devel/master' into tizen

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

diff --git a/adaptors/common/style-monitor-impl.h b/adaptors/common/style-monitor-impl.h
index f2aa027..5fffbbe 100644 (file)
--- a/adaptors/common/style-monitor-impl.h
+++ b/adaptors/common/style-monitor-impl.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/platform-abstraction.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
 
 // INTERNAL INCLUDES
 #include <style-monitor.h>
@@ -47,9 +47,8 @@ public:
 
   /**
    * Constructor.
-   * @param[in]  platformAbstraction  The platform abstraction.
    */
-  StyleMonitor(Integration::PlatformAbstraction& platformAbstraction);
+  StyleMonitor();
 
   /**
    * Retrieve the initialized instance of the StyleMonitor.
@@ -63,7 +62,7 @@ public:
    * Informs the Style Monitor that the style has changed.
    * @param[in]  styleChange  The details of the change.
    */
-  void StyleChanged(StyleChange styleChange);
+  void StyleChanged( StyleChange::Type styleChange );
 
   // Style Information
 
@@ -92,6 +91,11 @@ public:
    */
   void SetTheme(const std::string& themeFilePath);
 
+  /**
+   * @copydoc Dali::StyleMonitor::LoadThemeFile()
+   */
+  bool LoadThemeFile( const std::string& filename, std::string& output );
+
   // Signals
 
   /**
@@ -112,15 +116,14 @@ private:
    * Emit the style change signal.
    * @param[in]  styleChange  The details of the style change
    */
-  inline void EmitStyleChangeSignal(StyleChange styleChange);
+  inline void EmitStyleChangeSignal( StyleChange::Type styleChange );
 
 private:
 
   Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style changes
 
-  Integration::PlatformAbstraction& mPlatformAbstraction; ///< Reference to the PlatformAbstraction (for retrieving defaults)
-
-  std::string mDefaultFontFamily;        ///< The default font family
+  TextAbstraction::FontClient mFontClient;
+  std::string mDefaultFontFamily;        ///< The system default font family
   std::string mDefaultFontStyle;         ///< The default font style
   std::string mUserDefinedThemeFilePath; ///< String containing the user defined theme file path
   int mDefaultFontSize;                  ///< The default accessibility font size e.g. 0 is smallest