X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.cpp;h=98596eb318e23fc8ed9ece30720d8661cbbcec14;hp=4378e849388588c0a69f9754eeb26613015c96c7;hb=ffef1f9f5d7d0f6beff38e628d0f4b91c61b62d4;hpb=e6b7228703163899cf4bf4648a12ac5dbf73807d diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index 4378e84..98596eb 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.cpp +++ b/dali-toolkit/internal/styling/style-manager-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,29 +18,31 @@ #include "style-manager-impl.h" // EXTERNAL INCLUDES -#include -#include -#include -#include +#include #include #include #include +#include // INTERNAL INCLUDES +#include #include #include #include +#include namespace { -const char* LANDSCAPE_QUALIFIER = "landscape"; +//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 "tizen-default-theme.json"; +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 @@ -100,86 +102,171 @@ Toolkit::StyleManager StyleManager::Get() } 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(); - RequestDefaultTheme(); - - StyleMonitor styleMonitor( StyleMonitor::Get() ); - if( styleMonitor ) + mStyleMonitor = StyleMonitor::Get(); + if( mStyleMonitor ) { - styleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange ); - - mDefaultFontSize = styleMonitor.GetDefaultFontSize(); + mStyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange ); + mDefaultFontSize = mStyleMonitor.GetDefaultFontSize(); } + + // Sound & haptic style + mFeedbackStyle = new FeedbackStyle(); } StyleManager::~StyleManager() { + delete mFeedbackStyle; +} + +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::SetOrientationValue( int orientation ) +void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value ) { - if( orientation != mOrientationDegrees ) + mStyleBuilderConstants[ key ] = value; +} + +bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& valueOut ) +{ + 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 ); } +} + +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 ); - OnOrientationChanged( orientation ); + // Create it + builder = CreateBuilder( constants ); - if( mOrientation ) + if( LoadJSON( builder, jsonFileName ) ) + { + CacheBuilder( builder, jsonFileName ); + builderReady = true; + } + } + + // Apply the style to the control + if( builderReady ) { - mOrientation.ChangedSignal().Connect( this, &StyleManager::OnOrientationChanged ); + 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 ) @@ -205,39 +292,39 @@ bool StyleManager::LoadJSON( Toolkit::Builder builder, const std::string& jsonFi } } -void StyleManager::CollectQualifiers( StringList& qualifiersOut ) +static void CollectQualifiers( std::vector& qualifiersOut ) { // Append the relevant qualifier for orientation - int orientation = mOrientationDegrees; + // int orientation = 0; // Get the orientation from the system + /* + //// To Do ///// + Getting orientation from the system, and determine Qualifie LANDSCAPE or PORTRAIT + orientation 0, 180 : PORTRAIT_QUALIFIER (default) + orientation 90, 270 : LANDSCAPE_QUALIFIER + */ - if( mOrientation ) - { - orientation = mOrientation.GetDegrees(); - } + qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) ); - switch( orientation ) - { - case 90: - case 270: - { - qualifiersOut.push_back( std::string( LANDSCAPE_QUALIFIER ) ); - break; - } - case 180: - case 0: // fall through - default: - { - qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) ); - break; - } - } } -void StyleManager::BuildQualifiedStyleName( const std::string& styleName, const StringList& qualifiers, std::string& qualifiedStyleOut ) +/** + * @brief Construct a qualified style name out of qualifiers + * + * A qualifed style name will be in the format: style-qualifier0-qualifier1-qualifierN + * + * @param[in] styleName The root name of the style + * @param[in] qualifiers List of qualifier names + * @param[out] qualifiedStyleOut The qualified style name + */ +static void BuildQualifiedStyleName( + const std::string& styleName, + const std::vector& qualifiers, + std::string& qualifiedStyleOut ) { qualifiedStyleOut.append( styleName ); - for( StringList::const_iterator it = qualifiers.begin(), itEnd = qualifiers.end(); it != itEnd; ++it ) + for( std::vector::const_iterator it = qualifiers.begin(), + itEnd = qualifiers.end(); it != itEnd; ++it ) { const std::string& str = *it; @@ -246,136 +333,77 @@ void StyleManager::BuildQualifiedStyleName( const std::string& styleName, const } } -void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control control ) +static bool GetStyleNameForControl( Toolkit::Builder builder, Toolkit::Control control, std::string& styleName) { - std::string styleName = control.GetStyleName(); + styleName = control.GetStyleName(); + if( styleName.empty() ) { - // Convert control name to lower case styleName = control.GetTypeName(); - std::transform( styleName.begin(), styleName.end(), styleName.begin(), ::tolower ); } // Apply the style after choosing the correct actual style (e.g. landscape or portrait) - StringList qualifiers; + std::vector qualifiers; CollectQualifiers( qualifiers ); - while( true ) + bool found = 0; + std::string qualifiedStyleName; + do { - std::string qualifiedStyleName; + qualifiedStyleName.clear(); BuildQualifiedStyleName( styleName, qualifiers, qualifiedStyleName ); // Break if style found or we have tried the root style name (qualifiers is empty) - if( builder.ApplyStyle( qualifiedStyleName, control ) || qualifiers.size() == 0 ) + if( GetImpl(builder).LookupStyleName( qualifiedStyleName ) ) + { + found = true; + break; + } + if( qualifiers.size() == 0 ) { break; } - // Remove the last qualifier in an attempt to find a style that is valid qualifiers.pop_back(); - } - - if( mDefaultFontSize >= 0 ) - { - // Apply the style for logical font size - std::stringstream fontSizeQualifier; - fontSizeQualifier << styleName << "-" << FONT_SIZE_QUALIFIER << mDefaultFontSize; - builder.ApplyStyle( fontSizeQualifier.str(), control ); - } -} + } while (!found); -void StyleManager::ApplyThemeStyle( Toolkit::Control control ) -{ - if( mThemeBuilder ) + if(found) { - ApplyStyle( mThemeBuilder, control ); + styleName = qualifiedStyleName; } + return found; } -void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ) +void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control control ) { - 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 ) + std::string styleName = control.GetStyleName(); + if( GetStyleNameForControl( builder, control, styleName ) ) { builder.ApplyStyle( styleName, control ); } -} -bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut ) -{ - DALI_ASSERT_DEBUG( 0 != filename.length()); - - std::ifstream in( filename.c_str(), std::ios::in ); - if( in ) + if( mDefaultFontSize >= 0 ) { - std::stringstream buffer; - buffer << in.rdbuf(); - - stringOut = buffer.str(); - - in.close(); - - return true; + // Apply the style for logical font size + std::stringstream fontSizeQualifier; + fontSizeQualifier << styleName << FONT_SIZE_QUALIFIER << mDefaultFontSize; + builder.ApplyStyle( fontSizeQualifier.str(), control ); } - - 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() +const StylePtr StyleManager::GetRecordedStyle( Toolkit::Control control ) { - mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); - if ( LoadJSON( mThemeBuilder, mThemeFile ) ) - { - StyleChange change; - change.themeChange = true; - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change ); - } - else + if( mThemeBuilder ) { - mThemeBuilder.Reset(); + std::string styleName = control.GetStyleName(); + + if( GetStyleNameForControl( mThemeBuilder, control, styleName ) ) + { + const StylePtr style = GetImpl(mThemeBuilder).GetStyle( styleName ); + return style; + } } + return StylePtr(NULL); } Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key ) @@ -394,16 +422,43 @@ void StyleManager::CacheBuilder( Toolkit::Builder builder, const std::string& ke mBuilderCache[ key ] = builder; } -void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange ) +void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ) { - if( styleChange.defaultFontSizeChange ) + switch ( styleChange ) { - mDefaultFontSize = styleMonitor.GetDefaultFontSize(); + case StyleChange::DEFAULT_FONT_CHANGE: + { + mDefaultFontFamily = styleMonitor.GetDefaultFontFamily(); + break; + } + + case StyleChange::DEFAULT_FONT_SIZE_CHANGE: + { + mDefaultFontSize = styleMonitor.GetDefaultFontSize(); + break; + } + + case StyleChange::THEME_CHANGE: + { + 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