Remove orientation from application class

[platform/core/uifw/dali-adaptor.git] / adaptors / public-api / adaptor-framework / style-monitor.h

diff --git a/adaptors/public-api/adaptor-framework/style-monitor.h b/adaptors/public-api/adaptor-framework/style-monitor.h
index 711d087..1859b7d 100644 (file)
--- a/adaptors/public-api/adaptor-framework/style-monitor.h
+++ b/adaptors/public-api/adaptor-framework/style-monitor.h
@@ -19,16 +19,15 @@
  */
 
 // EXTERNAL INCLUDES
-#include <boost/function.hpp>
 #include <string>
 
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 // INTERNAL INCLUDES
 #include "style-change.h"
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -46,11 +45,11 @@ class StyleMonitor;
  * It provides a signal when any aspect of the default style changes on the device.
  * @see Adaptor::GetStyleMonitor
  */
-class StyleMonitor : public BaseHandle
+class DALI_IMPORT_API StyleMonitor : public BaseHandle
 {
 public: // Typedefs
 
-  typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2;   ///< StyleChange Signal type
+  typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType;   ///< StyleChange Signal type
 
 public: // Creation & Destruction
 
@@ -104,10 +103,19 @@ public: // Style Information
   std::string GetDefaultFontFamily() const;
 
   /**
-   * @brief Retrieves the default font size
-   * @return The default font size.
+   * @brief Retrieves the default font style.
+   * @return The default font style.
    */
-  float GetDefaultFontSize() const;
+  std::string GetDefaultFontStyle() const;
+
+  /**
+   * @brief Retrieves the default font size.
+   *
+   * This is an logical size, which is mapped to a UI Control specific point-size in stylesheets.
+   * For example if zero the smallest size, this could potentially map to TextLabel point-size 8.
+   * @return The default font size, or a negative value if not set.
+   */
+  int GetDefaultFontSize() const;
 
   /**
    * @brief Retrieves the user defined Theme.
@@ -132,7 +140,7 @@ public: // Signals
    * @endcode
    * @return The signal to connect to.
    */
-  StyleChangeSignalV2& StyleChangeSignal();
+  StyleChangeSignalType& StyleChangeSignal();
 
 public: // Operators
 
@@ -145,16 +153,6 @@ public: // Operators
    */
   StyleMonitor& operator=(const StyleMonitor& monitor);
 
-  /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  StyleMonitor& operator=(BaseHandle::NullType* rhs);
-
 public: // Not intended for application developers
   /**
    * @brief This constructor is used internally to create a handle from an object pointer.