X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.cpp;h=71baa9622bdbffe428ec61d6703307c10a05b5fe;hb=3f8b8fcfaa2f6fa18a5d8b6d9f86d0960f0bfdd1;hp=c245c15f2b2851c35f08319ba73877f906b784d0;hpb=a8bc013df97fad9f1cc2d95c37248464ac553e6e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index c245c15..71baa96 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.cpp +++ b/dali-toolkit/internal/styling/style-manager-impl.cpp @@ -20,13 +20,13 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include // INTERNAL INCLUDES #include #include -#include +#include #include namespace @@ -34,7 +34,7 @@ namespace const char* LANDSCAPE_QUALIFIER = "landscape"; const char* PORTRAIT_QUALIFIER = "portrait"; -const char* FONT_SIZE_QUALIFIER = "font-size-"; +const char* FONT_SIZE_QUALIFIER = "FontSize"; const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json"; @@ -98,9 +98,8 @@ Toolkit::StyleManager StyleManager::Get() } StyleManager::StyleManager() -: mOrientationDegrees( 0 ), // Portrait - mDefaultFontSize( -1 ), - mThemeFile( DEFAULT_THEME ), +: mDefaultFontSize( -1 ), + mDefaultFontFamily(""), mFeedbackStyle( NULL ) { // Add theme builder constants @@ -116,7 +115,6 @@ StyleManager::StyleManager() // Sound & haptic style mFeedbackStyle = new FeedbackStyle(); - } StyleManager::~StyleManager() @@ -124,65 +122,147 @@ StyleManager::~StyleManager() delete mFeedbackStyle; } -void StyleManager::SetOrientationValue( int orientation ) +void StyleManager::ApplyTheme( const std::string& themeFile ) +{ + SetTheme( themeFile ); +} + +void StyleManager::ApplyDefaultTheme() +{ + std::string empty; + SetTheme( empty ); +} + +const std::string& StyleManager::GetDefaultFontFamily() const +{ + return mDefaultFontFamily; +} + +void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value ) +{ + mStyleBuilderConstants[ key ] = value; +} + +bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& valueOut ) { - if( orientation != mOrientationDegrees ) + Property::Value* value = mStyleBuilderConstants.Find( key ); + if( value ) { - 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(); + valueOut = *value; + return true; } + + return false; } -int StyleManager::GetOrientationValue() +void StyleManager::ApplyThemeStyle( Toolkit::Control control ) { - return mOrientationDegrees; + if( !mThemeBuilder ) + { + ApplyDefaultTheme(); + } + + if( mThemeBuilder ) + { + ApplyStyle( mThemeBuilder, control ); + } } -void StyleManager::SetOrientation( Orientation orientation ) +void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control ) { - if( mOrientation ) + ApplyThemeStyle( control ); + + if(mFeedbackStyle) { - mOrientation.ChangedSignal().Disconnect( this, &StyleManager::OnOrientationChanged ); + mFeedbackStyle->ObjectCreated( control ); } +} - OnOrientationChanged( orientation ); +void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ) +{ + bool builderReady = false; - if( mOrientation ) + // First look in the cache + Toolkit::Builder builder = FindCachedBuilder( jsonFileName ); + if( builder ) { - mOrientation.ChangedSignal().Connect( this, &StyleManager::OnOrientationChanged ); + builderReady = true; + } + else + { + // Merge theme and style constants + Property::Map constants( mThemeBuilderConstants ); + constants.Merge( mStyleBuilderConstants ); + + // Create it + builder = CreateBuilder( constants ); + + if( LoadJSON( builder, jsonFileName ) ) + { + CacheBuilder( builder, jsonFileName ); + builderReady = true; + } + } + + // Apply the style to the control + if( builderReady ) + { + builder.ApplyStyle( styleName, control ); } } -Orientation StyleManager::GetOrientation() +Toolkit::StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal() { - return mOrientation; + return mStyleChangedSignal; } -void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value ) +Toolkit::StyleManager::StyleChangedSignalType& StyleManager::ControlStyleChangeSignal() { - mStyleBuilderConstants[ key ] = value; + return mControlStyleChangeSignal; } -bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& valueOut ) +void StyleManager::SetTheme( const std::string& themeFile ) { - Property::Value* value = mStyleBuilderConstants.Find( key ); - if( value ) + bool themeLoaded = false; + + mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); + + // Always load the default theme first, then merge in the custom theme if present + themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME ); + + if( ! themeFile.empty() ) { - valueOut = *value; - return true; + mThemeFile = themeFile; + themeLoaded = LoadJSON( mThemeBuilder, mThemeFile ); } - return false; + if( themeLoaded ) + { + if(mFeedbackStyle) + { + mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE ); + } + + EmitStyleChangeSignals(StyleChange::THEME_CHANGE); + } + else + { + mThemeBuilder.Reset(); + } } -void StyleManager::OnOrientationChanged( Orientation orientation ) +bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut ) { - 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(); + DALI_ASSERT_DEBUG( 0 != filename.length()); + + // as toolkit is platform agnostic, it cannot load files from filesystem + // ask style monitor to load the style sheet + if( mStyleMonitor ) + { + return mStyleMonitor.LoadThemeFile( filename, stringOut ); + } + + return false; } Toolkit::Builder StyleManager::CreateBuilder( const Property::Map& constants ) @@ -211,13 +291,7 @@ bool StyleManager::LoadJSON( Toolkit::Builder builder, const std::string& jsonFi 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: @@ -283,121 +357,11 @@ void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control contro { // Apply the style for logical font size std::stringstream fontSizeQualifier; - fontSizeQualifier << styleName << "-" << FONT_SIZE_QUALIFIER << mDefaultFontSize; + fontSizeQualifier << styleName << FONT_SIZE_QUALIFIER << mDefaultFontSize; builder.ApplyStyle( fontSizeQualifier.str(), control ); } } -void StyleManager::ApplyThemeStyle( Toolkit::Control control ) -{ - if( !mThemeBuilder ) - { - RequestDefaultTheme(); - } - - if( mThemeBuilder ) - { - ApplyStyle( mThemeBuilder, control ); - } -} - -void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control ) -{ - if( mThemeBuilder ) - { - ApplyStyle( mThemeBuilder, control ); - } - - if(mFeedbackStyle) - { - mFeedbackStyle->ObjectCreated( control ); - } -} - -void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ) -{ - bool builderReady = false; - - // First look in the cache - Toolkit::Builder builder = FindCachedBuilder( jsonFileName ); - if( builder ) - { - builderReady = true; - } - else - { - // Merge theme and style constants - Property::Map constants( mThemeBuilderConstants ); - constants.Merge( mStyleBuilderConstants ); - - // Create it - builder = CreateBuilder( constants ); - - if( LoadJSON( builder, jsonFileName ) ) - { - CacheBuilder( builder, jsonFileName ); - builderReady = true; - } - } - - // Apply the style to the control - if( builderReady ) - { - builder.ApplyStyle( styleName, control ); - } -} - -bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut ) -{ - DALI_ASSERT_DEBUG( 0 != filename.length()); - - // as toolkit is platform agnostic, it cannot load files from filesystem - // ask style monitor to load the style sheet - if( mStyleMonitor ) - { - return mStyleMonitor.LoadThemeFile( filename, stringOut ); - } - - return false; -} - -Toolkit::StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal() -{ - return mStyleChangeSignal; -} - -void StyleManager::RequestThemeChange( const std::string& themeFile ) -{ - mThemeFile = themeFile; - - // need to do style change synchronously as app might create a UI control on the next line - SetTheme(); -} - -void StyleManager::RequestDefaultTheme() -{ - RequestThemeChange( DEFAULT_THEME ); -} - -void StyleManager::SetTheme() -{ - mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); - - if( LoadJSON( mThemeBuilder, mThemeFile ) ) - { - if(mFeedbackStyle) - { - mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE ); - } - - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE ); - } - else - { - mThemeBuilder.Reset(); - } -} - Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key ) { BuilderMap::iterator builderIt = mBuilderCache.find( key ); @@ -420,6 +384,7 @@ void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::T { case StyleChange::DEFAULT_FONT_CHANGE: { + mDefaultFontFamily = styleMonitor.GetDefaultFontFamily(); break; } @@ -431,24 +396,25 @@ void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::T case StyleChange::THEME_CHANGE: { - const std::string& newTheme = styleMonitor.GetTheme(); - if( ! newTheme.empty() ) - { - mThemeFile = newTheme; - } - else - { - mThemeFile = DEFAULT_THEME; - } - - SetTheme(); + SetTheme( styleMonitor.GetTheme() ); break; } } + EmitStyleChangeSignals( styleChange ); +} + +void StyleManager::EmitStyleChangeSignals( StyleChange::Type styleChange ) +{ + Toolkit::StyleManager styleManager = StyleManager::Get(); + + // Update Controls first + mControlStyleChangeSignal.Emit( styleManager, styleChange ); - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange ); + // Inform application last + mStyleChangedSignal.Emit( styleManager, styleChange ); } + } // namespace Internal } // namespace Toolkit