// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/singleton-service.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry-helper.h>
#include <dali/integration-api/debug.h>
+#include <dali/public-api/adaptor-framework/application.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/devel-api/styling/style-manager.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>
#include <dali-toolkit/internal/feedback/feedback-style.h>
namespace
const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json";
const char* PACKAGE_PATH_KEY = "PACKAGE_PATH";
+const char* APPLICATION_RESOURCE_PATH_KEY = "APPLICATION_RESOURCE_PATH";
+
const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
} // namespace
}
StyleManager::StyleManager()
-: mOrientationDegrees( 0 ), // Portrait
- mDefaultFontSize( -1 ),
+: mDefaultFontSize( -1 ),
mDefaultFontFamily(""),
mFeedbackStyle( NULL )
{
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
+ mThemeBuilderConstants[ APPLICATION_RESOURCE_PATH_KEY ] = Application::GetResourcePath();
mStyleMonitor = StyleMonitor::Get();
if( mStyleMonitor )
{
mStyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
-
mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
}
delete mFeedbackStyle;
}
-void StyleManager::SetOrientationValue( int orientation )
+void StyleManager::ApplyTheme( const std::string& themeFile )
{
- if( orientation != mOrientationDegrees )
- {
- mOrientationDegrees = orientation;
- // TODO: if orientation changed, apply the new style to all controls
- // dont want to really do the whole load from file again if the bundle contains both portrait & landscape
- SetTheme( mThemeFile );
- }
-}
-
-int StyleManager::GetOrientationValue()
-{
- return mOrientationDegrees;
-}
-
-void StyleManager::SetOrientation( Orientation orientation )
-{
- if( mOrientation )
- {
- mOrientation.ChangedSignal().Disconnect( this, &StyleManager::OnOrientationChanged );
- }
-
- OnOrientationChanged( orientation );
-
- if( mOrientation )
- {
- mOrientation.ChangedSignal().Connect( this, &StyleManager::OnOrientationChanged );
- }
+ SetTheme( themeFile );
}
-Orientation StyleManager::GetOrientation()
+void StyleManager::ApplyDefaultTheme()
{
- return mOrientation;
+ std::string empty;
+ SetTheme( empty );
}
-std::string StyleManager::GetDefaultFontFamily() const
+const std::string& StyleManager::GetDefaultFontFamily() const
{
return mDefaultFontFamily;
}
return false;
}
-void StyleManager::RequestThemeChange( const std::string& themeFile )
-{
- SetTheme( themeFile );
-}
-
-void StyleManager::RequestDefaultTheme()
-{
- std::string empty;
- SetTheme( empty );
-}
-
void StyleManager::ApplyThemeStyle( Toolkit::Control control )
{
if( !mThemeBuilder )
{
- RequestDefaultTheme();
+ ApplyDefaultTheme();
}
if( mThemeBuilder )
}
}
-Toolkit::StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal()
+Toolkit::StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal()
{
- return mStyleChangeSignal;
+ return mStyleChangedSignal;
+}
+
+Toolkit::StyleManager::StyleChangedSignalType& StyleManager::ControlStyleChangeSignal()
+{
+ return mControlStyleChangeSignal;
}
void StyleManager::SetTheme( const std::string& themeFile )
mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE );
}
- mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE );
+ EmitStyleChangeSignals(StyleChange::THEME_CHANGE);
}
else
{
void StyleManager::CollectQualifiers( StringList& qualifiersOut )
{
// Append the relevant qualifier for orientation
- int orientation = mOrientationDegrees;
-
- if( mOrientation )
- {
- orientation = mOrientation.GetDegrees();
- }
-
+ int orientation = 0; // Get the orientation from the system
switch( orientation )
{
case 90:
}
}
-void StyleManager::OnOrientationChanged( Orientation orientation )
-{
- mOrientation = orientation;
- // TODO: if orientation changed, apply the new style to all controls
- // dont want to really do the whole load from file again if the bundle contains both portrait & landscape
- SetTheme( mThemeFile );
-}
-
-
Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key )
{
BuilderMap::iterator builderIt = mBuilderCache.find( key );
break;
}
}
+ EmitStyleChangeSignals( styleChange );
+}
+
+void StyleManager::EmitStyleChangeSignals( StyleChange::Type styleChange )
+{
+ Toolkit::StyleManager styleManager = StyleManager::Get();
- mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
+ // Update Controls first
+ mControlStyleChangeSignal.Emit( styleManager, styleChange );
+
+ // Inform application last
+ mStyleChangedSignal.Emit( styleManager, styleChange );
}
+
} // namespace Internal
} // namespace Toolkit