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=0968081cb16e1ece5a6a56b7b9272a41922469e7;hp=df885d9fc1174a2e261811c4eb4fef16a3df5b6c;hb=7fe4f51894c4c9f158e64b3d11d5d9c8ebdbf990;hpb=1e6044c72b27cd4ecfda3c929263d5aefa1efad0 diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index df885d9..0968081 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) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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,58 +18,58 @@ #include "style-manager-impl.h" // EXTERNAL INCLUDES -#include -#include -#include +#include #include #include +#include +#include // INTERNAL INCLUDES +#include #include -#include +#include #include +#include #include -#include namespace { - //const char* LANDSCAPE_QUALIFIER = "landscape"; const char* PORTRAIT_QUALIFIER = "portrait"; const char* FONT_SIZE_QUALIFIER = "fontsize"; -const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json"; +const char* DEFAULT_THEME_FILE_NAME = "dali-toolkit-default-theme.json"; -const char* PACKAGE_PATH_KEY = "PACKAGE_PATH"; +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/"; +const char* DEFAULT_TOOLKIT_PACKAGE_PATH = "/toolkit/"; + +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_STYLE"); +#endif } // namespace namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - BaseHandle Create() { BaseHandle handle = StyleManager::Get(); - if ( !handle ) + if(!handle) { - SingletonService singletonService( SingletonService::Get() ); - if ( singletonService ) + SingletonService singletonService(SingletonService::Get()); + if(singletonService) { - Toolkit::StyleManager manager = Toolkit::StyleManager( new Internal::StyleManager() ); - singletonService.Register( typeid( manager ), manager ); + Toolkit::StyleManager manager = Toolkit::StyleManager(new Internal::StyleManager()); + singletonService.Register(typeid(manager), manager); handle = manager; } } @@ -77,7 +77,7 @@ BaseHandle Create() return handle; } -DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::StyleManager, Dali::BaseHandle, Create, true ) +DALI_TYPE_REGISTRATION_BEGIN_CREATE(Toolkit::StyleManager, Dali::BaseHandle, Create, true) DALI_TYPE_REGISTRATION_END() } // namespace @@ -86,15 +86,15 @@ Toolkit::StyleManager StyleManager::Get() { Toolkit::StyleManager manager; - SingletonService singletonService( SingletonService::Get() ); - if ( singletonService ) + SingletonService singletonService(SingletonService::Get()); + if(singletonService) { // Check whether the style manager is already created - Dali::BaseHandle handle = singletonService.GetSingleton( typeid( Toolkit::StyleManager ) ); - if( handle ) + Dali::BaseHandle handle = singletonService.GetSingleton(typeid(Toolkit::StyleManager)); + if(handle) { // If so, downcast the handle of singleton - manager = Toolkit::StyleManager( dynamic_cast< StyleManager* >( handle.GetObjectPtr() ) ); + manager = Toolkit::StyleManager(dynamic_cast(handle.GetObjectPtr())); } } @@ -102,21 +102,27 @@ Toolkit::StyleManager StyleManager::Get() } StyleManager::StyleManager() -: mDefaultFontSize( -1 ), +: mDefaultFontSize(-1), mDefaultFontFamily(""), - mFeedbackStyle( NULL ) + mDefaultThemeFilePath(), + mFeedbackStyle(nullptr) { // Add theme builder constants - mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH; - mThemeBuilderConstants[ APPLICATION_RESOURCE_PATH_KEY ] = Application::GetResourcePath(); + const std::string dataReadOnlyDir = AssetManager::GetDaliDataReadOnlyPath(); + mThemeBuilderConstants[PACKAGE_PATH_KEY] = dataReadOnlyDir + DEFAULT_TOOLKIT_PACKAGE_PATH; + mThemeBuilderConstants[APPLICATION_RESOURCE_PATH_KEY] = Application::GetResourcePath(); mStyleMonitor = StyleMonitor::Get(); - if( mStyleMonitor ) + if(mStyleMonitor) { - mStyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange ); + mStyleMonitor.StyleChangeSignal().Connect(this, &StyleManager::StyleMonitorChange); mDefaultFontSize = mStyleMonitor.GetDefaultFontSize(); } + // Set the full path for the default style theme. + const std::string styleDirPath = AssetManager::GetDaliStylePath(); + mDefaultThemeFilePath = styleDirPath + DEFAULT_THEME_FILE_NAME; + // Sound & haptic style mFeedbackStyle = new FeedbackStyle(); } @@ -126,14 +132,14 @@ StyleManager::~StyleManager() delete mFeedbackStyle; } -void StyleManager::ApplyTheme( const std::string& themeFile ) +void StyleManager::ApplyTheme(const std::string& themeFile) { - SetTheme( themeFile ); + SetTheme(themeFile); } void StyleManager::ApplyDefaultTheme() { - SetTheme( DEFAULT_THEME ); + SetTheme(mDefaultThemeFilePath); } const std::string& StyleManager::GetDefaultFontFamily() const @@ -141,15 +147,15 @@ const std::string& StyleManager::GetDefaultFontFamily() const return mDefaultFontFamily; } -void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value ) +void StyleManager::SetStyleConstant(const std::string& key, const Property::Value& value) { - mStyleBuilderConstants[ key ] = value; + mStyleBuilderConstants[key] = value; } -bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& valueOut ) +bool StyleManager::GetStyleConstant(const std::string& key, Property::Value& valueOut) { - Property::Value* value = mStyleBuilderConstants.Find( key ); - if( value ) + Property::Value* value = mStyleBuilderConstants.Find(key); + if(value) { valueOut = *value; return true; @@ -158,59 +164,59 @@ bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& va return false; } -void StyleManager::ApplyThemeStyle( Toolkit::Control control ) +void StyleManager::ApplyThemeStyle(Toolkit::Control control) { - if( !mThemeBuilder ) + if(!mThemeBuilder) { ApplyDefaultTheme(); } - if( mThemeBuilder ) + if(mThemeBuilder) { - ApplyStyle( mThemeBuilder, control ); + ApplyStyle(mThemeBuilder, control); } } -void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control ) +void StyleManager::ApplyThemeStyleAtInit(Toolkit::Control control) { - ApplyThemeStyle( control ); + ApplyThemeStyle(control); if(mFeedbackStyle) { - mFeedbackStyle->ObjectCreated( control ); + mFeedbackStyle->ObjectCreated(control); } } -void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ) +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 ) + Toolkit::Builder builder = FindCachedBuilder(jsonFileName); + if(builder) { builderReady = true; } else { // Merge theme and style constants - Property::Map constants( mThemeBuilderConstants ); - constants.Merge( mStyleBuilderConstants ); + Property::Map constants(mThemeBuilderConstants); + constants.Merge(mStyleBuilderConstants); // Create it - builder = CreateBuilder( constants ); + builder = CreateBuilder(constants); - if( LoadJSON( builder, jsonFileName ) ) + if(LoadJSON(builder, jsonFileName)) { - CacheBuilder( builder, jsonFileName ); + CacheBuilder(builder, jsonFileName); builderReady = true; } } // Apply the style to the control - if( builderReady ) + if(builderReady) { - builder.ApplyStyle( styleName, control ); + builder.ApplyStyle(styleName, control); } } @@ -224,97 +230,113 @@ Toolkit::StyleManager::StyleChangedSignalType& StyleManager::ControlStyleChangeS return mControlStyleChangeSignal; } -void StyleManager::SetTheme( const std::string& themeFile ) +void StyleManager::SetTheme(const std::string& themeFile) { bool themeLoaded = false; + bool loading = false; - if( mThemeFile.compare(DEFAULT_THEME) == 0 && mThemeBuilder ) + // If we haven't loaded a theme, or the stored theme file is empty, or + // the previously loaded theme is different to the requested theme, + // first reset the builder and load the default theme. + if(!mThemeBuilder || mThemeFile.empty() || mThemeFile.compare(themeFile) != 0) { - // We have already loaded the default theme into mThemeBuilder - } - else - { - // Reload the default theme - mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); - themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME ); + loading = true; + mThemeBuilder = CreateBuilder(mThemeBuilderConstants); + themeLoaded = LoadJSON(mThemeBuilder, mDefaultThemeFilePath); // Sets themeLoaded to true if theme exists } - if( themeFile.compare(DEFAULT_THEME) != 0 ) + if(themeFile.compare(mDefaultThemeFilePath) != 0) { // The theme is different to the default: Merge it - themeLoaded = LoadJSON( mThemeBuilder, themeFile ); - mThemeFile = themeFile; + loading = true; + themeLoaded |= LoadJSON(mThemeBuilder, themeFile); } - if( themeLoaded ) + if(loading) { - if(mFeedbackStyle) + mThemeFile = themeFile; + + if(themeLoaded) { - mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE ); - } + // We've successfully loaded the theme file + if(mFeedbackStyle) + { + mFeedbackStyle->StyleChanged(mThemeFile, StyleChange::THEME_CHANGE); + } - EmitStyleChangeSignals(StyleChange::THEME_CHANGE); - } - else - { - mThemeBuilder.Reset(); + EmitStyleChangeSignals(StyleChange::THEME_CHANGE); + } + else + { + // We tried to load a theme, but it failed. Ensure the builder is reset + mThemeBuilder.Reset(); + mThemeFile.clear(); + } } } const Property::Map StyleManager::GetConfigurations() { + DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations()\n On entry, mThemeBuilder: " << (bool(mThemeBuilder) ? "Created" : "Empty") << " mThemeFile: " << mThemeFile); + Property::Map result; - if( mThemeBuilder ) + if(mThemeBuilder) { result = mThemeBuilder.GetConfigurations(); } else { + DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations() Loading default theme"); + bool themeLoaded = false; - mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); + mThemeBuilder = CreateBuilder(mThemeBuilderConstants); // Load default theme because this is first try to load stylesheet. - themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME ); - mThemeFile = DEFAULT_THEME; + themeLoaded = LoadJSON(mThemeBuilder, mDefaultThemeFilePath); + mThemeFile = mDefaultThemeFilePath; - if( themeLoaded ) + if(themeLoaded) { result = mThemeBuilder.GetConfigurations(); } + DALI_LOG_STREAM(gLogFilter, Debug::Concise, " themeLoaded" << (themeLoaded ? "success" : "failure")); } + DALI_LOG_STREAM(gLogFilter, Debug::Concise, "GetConfigurations()\n On exit, result Count: " << (result.Count() != 0)); + DALI_LOG_STREAM(gLogFilter, Debug::Verbose, " result: " << result); + return result; } -bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut ) +bool StyleManager::LoadFile(const std::string& filename, std::string& stringOut) { - DALI_ASSERT_DEBUG( 0 != filename.length()); + 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 ) + if(mStyleMonitor) { - return mStyleMonitor.LoadThemeFile( filename, stringOut ); + return mStyleMonitor.LoadThemeFile(filename, stringOut); } return false; } -Toolkit::Builder StyleManager::CreateBuilder( const Property::Map& constants ) +Toolkit::Builder StyleManager::CreateBuilder(const Property::Map& constants) { Toolkit::Builder builder = Toolkit::Builder::New(); - builder.AddConstants( constants ); + builder.AddConstants(constants); return builder; } -bool StyleManager::LoadJSON( Toolkit::Builder builder, const std::string& jsonFilePath ) +bool StyleManager::LoadJSON(Toolkit::Builder builder, const std::string& jsonFilePath) { std::string fileString; - if( LoadFile( jsonFilePath, fileString ) ) + if(LoadFile(jsonFilePath, fileString)) { - builder.LoadFromString( fileString ); + builder.LoadFromString(fileString); return true; } else @@ -324,7 +346,7 @@ bool StyleManager::LoadJSON( Toolkit::Builder builder, const std::string& jsonFi } } -static void CollectQualifiers( std::vector& qualifiersOut ) +static void CollectQualifiers(std::vector& qualifiersOut) { // Append the relevant qualifier for orientation // int orientation = 0; // Get the orientation from the system @@ -335,8 +357,7 @@ static void CollectQualifiers( std::vector& qualifiersOut ) orientation 90, 270 : LANDSCAPE_QUALIFIER */ - qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) ); - + qualifiersOut.push_back(std::string(PORTRAIT_QUALIFIER)); } /** @@ -349,55 +370,57 @@ static void CollectQualifiers( std::vector& qualifiersOut ) * @param[out] qualifiedStyleOut The qualified style name */ static void BuildQualifiedStyleName( - const std::string& styleName, + const std::string& styleName, const std::vector& qualifiers, - std::string& qualifiedStyleOut ) + std::string& qualifiedStyleOut) { - qualifiedStyleOut.append( styleName ); + qualifiedStyleOut.append(styleName); - for( std::vector::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; - qualifiedStyleOut.append( "-" ); - qualifiedStyleOut.append( str ); + qualifiedStyleOut.append("-"); + qualifiedStyleOut.append(str); } } -static bool GetStyleNameForControl( Toolkit::Builder builder, Toolkit::Control control, std::string& styleName) +static bool GetStyleNameForControl(Toolkit::Builder builder, Toolkit::Control control, std::string& styleName) { styleName = control.GetStyleName(); - if( styleName.empty() ) + if(styleName.empty()) { styleName = control.GetTypeName(); } // Apply the style after choosing the correct actual style (e.g. landscape or portrait) std::vector qualifiers; - CollectQualifiers( qualifiers ); + CollectQualifiers(qualifiers); - bool found = 0; + bool found = 0; std::string qualifiedStyleName; do { qualifiedStyleName.clear(); - BuildQualifiedStyleName( styleName, qualifiers, qualifiedStyleName ); + BuildQualifiedStyleName(styleName, qualifiers, qualifiedStyleName); // Break if style found or we have tried the root style name (qualifiers is empty) - if( GetImpl(builder).LookupStyleName( qualifiedStyleName ) ) + if(GetImpl(builder).LookupStyleName(qualifiedStyleName)) { found = true; break; } - if( qualifiers.size() == 0 ) + if(qualifiers.size() == 0) { break; } // Remove the last qualifier in an attempt to find a style that is valid qualifiers.pop_back(); - } while (!found); + } while(!found); if(found) { @@ -406,42 +429,42 @@ static bool GetStyleNameForControl( Toolkit::Builder builder, Toolkit::Control c return found; } -void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control control ) +void StyleManager::ApplyStyle(Toolkit::Builder builder, Toolkit::Control control) { std::string styleName = control.GetStyleName(); - if( GetStyleNameForControl( builder, control, styleName ) ) + if(GetStyleNameForControl(builder, control, styleName)) { - builder.ApplyStyle( styleName, control ); + builder.ApplyStyle(styleName, control); } - if( mDefaultFontSize >= 0 ) + if(mDefaultFontSize >= 0) { // Apply the style for logical font size std::stringstream fontSizeQualifier; fontSizeQualifier << styleName << FONT_SIZE_QUALIFIER << mDefaultFontSize; - builder.ApplyStyle( fontSizeQualifier.str(), control ); + builder.ApplyStyle(fontSizeQualifier.str(), control); } } -const StylePtr StyleManager::GetRecordedStyle( Toolkit::Control control ) +const StylePtr StyleManager::GetRecordedStyle(Toolkit::Control control) { - if( mThemeBuilder ) + if(mThemeBuilder) { std::string styleName = control.GetStyleName(); - if( GetStyleNameForControl( mThemeBuilder, control, styleName ) ) + if(GetStyleNameForControl(mThemeBuilder, control, styleName)) { - const StylePtr style = GetImpl(mThemeBuilder).GetStyle( styleName ); + const StylePtr style = GetImpl(mThemeBuilder).GetStyle(styleName); return style; } } return StylePtr(NULL); } -Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key ) +Toolkit::Builder StyleManager::FindCachedBuilder(const std::string& key) { - BuilderMap::iterator builderIt = mBuilderCache.find( key ); - if( builderIt != mBuilderCache.end() ) + BuilderMap::iterator builderIt = mBuilderCache.find(key); + if(builderIt != mBuilderCache.end()) { return builderIt->second; } @@ -449,14 +472,14 @@ Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key ) return Toolkit::Builder(); } -void StyleManager::CacheBuilder( Toolkit::Builder builder, const std::string& key ) +void StyleManager::CacheBuilder(Toolkit::Builder builder, const std::string& key) { - mBuilderCache[ key ] = builder; + mBuilderCache[key] = builder; } -void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ) +void StyleManager::StyleMonitorChange(StyleMonitor styleMonitor, StyleChange::Type styleChange) { - switch ( styleChange ) + switch(styleChange) { case StyleChange::DEFAULT_FONT_CHANGE: { @@ -472,25 +495,24 @@ void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::T case StyleChange::THEME_CHANGE: { - SetTheme( styleMonitor.GetTheme() ); + SetTheme(styleMonitor.GetTheme()); break; } } - EmitStyleChangeSignals( styleChange ); + EmitStyleChangeSignals(styleChange); } -void StyleManager::EmitStyleChangeSignals( StyleChange::Type styleChange ) +void StyleManager::EmitStyleChangeSignals(StyleChange::Type styleChange) { Toolkit::StyleManager styleManager = StyleManager::Get(); // Update Controls first - mControlStyleChangeSignal.Emit( styleManager, styleChange ); + mControlStyleChangeSignal.Emit(styleManager, styleChange); // Inform application last - mStyleChangedSignal.Emit( styleManager, styleChange ); + mStyleChangedSignal.Emit(styleManager, styleChange); } - } // namespace Internal } // namespace Toolkit