Use stylesheet from StyleMonitor

[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 4378e84..bc249b3 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -21,15 +21,15 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/devel-api/object/type-registry-helper.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
+#include <dali-toolkit/devel-api/styling/style-manager.h>
 
 namespace
 {
@@ -101,13 +101,12 @@ Toolkit::StyleManager StyleManager::Get()
 
 StyleManager::StyleManager()
 : mOrientationDegrees( 0 ),  // Portrait
-  mDefaultFontSize( -1 )
+  mDefaultFontSize( -1 ),
+  mThemeFile( DEFAULT_THEME )
 {
   // Add theme builder constants
   mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
 
-  RequestDefaultTheme();
-
   StyleMonitor styleMonitor( StyleMonitor::Get() );
   if( styleMonitor )
   {
@@ -401,6 +400,20 @@ void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange st
     mDefaultFontSize = styleMonitor.GetDefaultFontSize();
   }
 
+  if( styleChange.themeChange )
+  {
+    if( ! styleChange.themeFilePath.empty() )
+    {
+      mThemeFile = styleChange.themeFilePath;
+    }
+    else
+    {
+      mThemeFile = DEFAULT_THEME;
+    }
+
+    SetTheme();
+  }
+
   mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
 }