Convert StyleChange to an enum

Change-Id: I065c581224edb845ec0b67cf9dfb3e3fd7df86be

diff --git a/adaptors/common/events/event-handler.h b/adaptors/common/events/event-handler.h
index f6a2fc9..4997700 100644 (file)
--- a/adaptors/common/events/event-handler.h
+++ b/adaptors/common/events/event-handler.h
@@ -35,8 +35,6 @@ namespace Dali
 
 class RenderSurface;
 
-struct StyleChange;
-
 namespace Internal
 {
 
@@ -138,7 +136,7 @@ private:
    * Send a style change event to the style monitor.
    * @param[in]  styleChange  The style that has changed.
    */
-  void SendEvent(StyleChange styleChange);
+  void SendEvent( StyleChange::Type styleChange );
 
   /**
    * Send a window damage event to the observer.

diff --git a/adaptors/common/feedback/feedback-controller.cpp b/adaptors/common/feedback/feedback-controller.cpp
index aa67853..dfbd168 100644 (file)
--- a/adaptors/common/feedback/feedback-controller.cpp
+++ b/adaptors/common/feedback/feedback-controller.cpp
@@ -224,11 +224,11 @@ const FeedbackStyleInfo& FeedbackController::GetStyleInfo( const string& type )
   }
 }
 
-void FeedbackController::StyleChangedCallback( Dali::StyleMonitor styleMonitor, Dali::StyleChange styleChange )
+void FeedbackController::StyleChangedCallback( Dali::StyleMonitor styleMonitor, Dali::StyleChange::Type styleChange )
 {
-  if( styleChange.themeChange )
+  if( StyleChange::THEME_CHANGE )
   {
-    const string& userDefinedThemePath = styleChange.themeFilePath;
+    const string& userDefinedThemePath = styleMonitor.GetTheme();
     const string& userDefinedTheme = LoadFile( userDefinedThemePath );
 
     if( !LoadTheme( userDefinedTheme ) )

diff --git a/adaptors/common/feedback/feedback-controller.h b/adaptors/common/feedback/feedback-controller.h
index a9bbb21..f3ef124 100644 (file)
--- a/adaptors/common/feedback/feedback-controller.h
+++ b/adaptors/common/feedback/feedback-controller.h
@@ -103,7 +103,7 @@ private:
    * Callback function for Dali::ObjectRegistry::SignalObjectCreated signal
    * @param [in] object Handle to the newly created object
    */
-  void StyleChangedCallback(Dali::StyleMonitor styleMonitor, StyleChange styleChange);
+  void StyleChangedCallback(Dali::StyleMonitor styleMonitor, StyleChange::Type styleChange);
 
   /**
    * Callback function for Dali::Toolkit::PushButton::SignalPressed signal

diff --git a/adaptors/common/style-monitor-impl.cpp b/adaptors/common/style-monitor-impl.cpp
index 6764883..b4dcd96 100644 (file)
--- a/adaptors/common/style-monitor-impl.cpp
+++ b/adaptors/common/style-monitor-impl.cpp
@@ -92,15 +92,26 @@ StyleMonitor::~StyleMonitor()
 {
 }
 
-void StyleMonitor::StyleChanged(StyleChange styleChange)
+void StyleMonitor::StyleChanged( StyleChange::Type styleChange )
 {
-  if ( styleChange.defaultFontChange )
+  switch ( styleChange )
   {
-    mPlatformAbstraction.GetDefaultFontDescription( mDefaultFontFamily, mDefaultFontStyle );
-  }
-  if ( styleChange.defaultFontSizeChange )
-  {
-    mDefaultFontSize = mPlatformAbstraction.GetDefaultFontSize();
+    case StyleChange::DEFAULT_FONT_CHANGE:
+    {
+      mPlatformAbstraction.GetDefaultFontDescription( mDefaultFontFamily, mDefaultFontStyle );
+      break;
+    }
+
+    case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
+    {
+      mDefaultFontSize = mPlatformAbstraction.GetDefaultFontSize();
+      break;
+    }
+
+    case StyleChange::THEME_CHANGE:
+    {
+      break;
+    }
   }
 
   EmitStyleChangeSignal(styleChange);
@@ -128,12 +139,8 @@ const std::string& StyleMonitor::GetTheme() const
 
 void StyleMonitor::SetTheme(const std::string& path)
 {
-  StyleChange styleChange;
-  styleChange.themeChange = true;
-  styleChange.themeFilePath = path;
   mUserDefinedThemeFilePath = path;
-
-  EmitStyleChangeSignal(styleChange);
+  EmitStyleChangeSignal( StyleChange::THEME_CHANGE );
 }
 
 bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
@@ -158,7 +165,7 @@ Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
   return mStyleChangeSignal;
 }
 
-void StyleMonitor::EmitStyleChangeSignal(StyleChange styleChange)
+void StyleMonitor::EmitStyleChangeSignal( StyleChange::Type styleChange )
 {
   if( !mStyleChangeSignal.Empty() )
   {

diff --git a/adaptors/common/style-monitor-impl.h b/adaptors/common/style-monitor-impl.h
index be32214..7c37a1a 100644 (file)
--- a/adaptors/common/style-monitor-impl.h
+++ b/adaptors/common/style-monitor-impl.h
@@ -63,7 +63,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
 
@@ -117,7 +117,7 @@ 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:
 

diff --git a/adaptors/devel-api/adaptor-framework/style-monitor.h b/adaptors/devel-api/adaptor-framework/style-monitor.h
index e4b3afa..bf63048 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/style-monitor.h
+++ b/adaptors/devel-api/adaptor-framework/style-monitor.h
@@ -54,7 +54,7 @@ class DALI_IMPORT_API StyleMonitor : public BaseHandle
 {
 public: // Typedefs
 
-  typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType;   ///< StyleChange Signal type
+  typedef Signal< void ( StyleMonitor, StyleChange::Type ) > StyleChangeSignalType;   ///< StyleChange Signal type
 
 public: // Creation & Destruction
 

diff --git a/adaptors/public-api/adaptor-framework/style-change.h b/adaptors/public-api/adaptor-framework/style-change.h
index 40b119f..adc0316 100644 (file)
--- a/adaptors/public-api/adaptor-framework/style-change.h
+++ b/adaptors/public-api/adaptor-framework/style-change.h
@@ -25,34 +25,18 @@
 namespace Dali
 {
 
-/**
- * @brief Used to describe what style information has changed.
- *
- * This structure is used when any style changes occur and contains information about what exactly
- * has changed.
- */
-struct DALI_IMPORT_API StyleChange
+namespace StyleChange
 {
-  // Construction
-
-  /**
-   * @brief Default Constructor.
-   */
-  StyleChange()
-  : defaultFontChange(false),
-    defaultFontSizeChange(false),
-    themeChange(false)
-  {
-  }
-
-  // Data
-
-  bool defaultFontChange:1;     ///< Denotes that the default font has changed.
-  bool defaultFontSizeChange:1; ///< Denotes that the default font size has changed.
-  bool themeChange:1;           ///< Denotes that the theme has changed.
-  std::string themeFilePath;    ///< Contains the path to the new theme file.
+
+enum Type
+{
+  DEFAULT_FONT_CHANGE,      ///< Denotes that the default font has changed.
+  DEFAULT_FONT_SIZE_CHANGE, ///< Denotes that the default font size has changed.
+  THEME_CHANGE              ///< Denotes that the theme has changed.
 };
 
+} // namespace StyleChange
+
 } // namespace Dali
 
 #endif // __DALI_STYLE_CHANGE_H__

diff --git a/adaptors/wayland/event-handler-wl.cpp b/adaptors/wayland/event-handler-wl.cpp
index f8aa01e..52c2369 100644 (file)
--- a/adaptors/wayland/event-handler-wl.cpp
+++ b/adaptors/wayland/event-handler-wl.cpp
@@ -637,11 +637,7 @@ struct EventHandler::Impl
   static void VconfNotifyFontNameChanged( keynode_t* node, void* data )
   {
     EventHandler* handler = static_cast<EventHandler*>( data );
-
-    StyleChange fontChange;
-    fontChange.defaultFontChange = true;
-
-    handler->SendEvent( fontChange );
+    handler->SendEvent( StyleChange::DEFAULT_FONT_CHANGE );
   }
 
   /**
@@ -650,11 +646,7 @@ struct EventHandler::Impl
   static void VconfNotifyFontSizeChanged( keynode_t* node, void* data )
   {
     EventHandler* handler = static_cast<EventHandler*>( data );
-
-    StyleChange fontChange;
-    fontChange.defaultFontSizeChange = true;
-
-    handler->SendEvent( fontChange );
+    handler->SendEvent( StyleChange::DEFAULT_FONT_SIZE_CHANGE );
   }
 
   // Data
@@ -754,7 +746,7 @@ void EventHandler::SendMouseWheelEvent( MouseWheelEvent& wheelEvent )
   mCoreEventInterface.ProcessCoreEvents();
 }
 
-void EventHandler::SendEvent(StyleChange styleChange)
+void EventHandler::SendEvent( StyleChange::Type styleChange )
 {
   DALI_ASSERT_DEBUG( mStyleMonitor && "StyleMonitor Not Available" );
   GetImplementation( mStyleMonitor ).StyleChanged(styleChange);

diff --git a/adaptors/x11/event-handler-x.cpp b/adaptors/x11/event-handler-x.cpp
index 050edfc..a63f950 100644 (file)
--- a/adaptors/x11/event-handler-x.cpp
+++ b/adaptors/x11/event-handler-x.cpp
@@ -1060,11 +1060,7 @@ struct EventHandler::Impl
   static void VconfNotifyFontNameChanged( keynode_t* node, void* data )
   {
     EventHandler* handler = static_cast<EventHandler*>( data );
-
-    StyleChange fontChange;
-    fontChange.defaultFontChange = true;
-
-    handler->SendEvent( fontChange );
+    handler->SendEvent( StyleChange::DEFAULT_FONT_CHANGE );
   }
 
   /**
@@ -1073,11 +1069,7 @@ struct EventHandler::Impl
   static void VconfNotifyFontSizeChanged( keynode_t* node, void* data )
   {
     EventHandler* handler = static_cast<EventHandler*>( data );
-
-    StyleChange fontChange;
-    fontChange.defaultFontSizeChange = true;
-
-    handler->SendEvent( fontChange );
+    handler->SendEvent( StyleChange::DEFAULT_FONT_SIZE_CHANGE );
   }
 #endif // DALI_PROFILE_UBUNTU
 
@@ -1179,7 +1171,7 @@ void EventHandler::SendMouseWheelEvent( MouseWheelEvent& wheelEvent )
   mCoreEventInterface.ProcessCoreEvents();
 }
 
-void EventHandler::SendEvent(StyleChange styleChange)
+void EventHandler::SendEvent( StyleChange::Type styleChange )
 {
   DALI_ASSERT_DEBUG( mStyleMonitor && "StyleMonitor Not Available" );
   GetImplementation( mStyleMonitor ).StyleChanged(styleChange);