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=5178020ddd838ff6681c3b9ccf756d09372e3d29;hb=ffef1f9f5d7d0f6beff38e628d0f4b91c61b62d4;hpb=c04d1be7d4dec47c2274160833021aafe10f720d diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index 5178020..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. @@ -20,25 +20,29 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include +#include // INTERNAL INCLUDES +#include #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 = "FontSize"; +const char* FONT_SIZE_QUALIFIER = "fontsize"; 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 @@ -98,20 +102,18 @@ Toolkit::StyleManager StyleManager::Get() } StyleManager::StyleManager() -: mOrientationDegrees( 0 ), // Portrait - mDefaultFontSize( -1 ), +: mDefaultFontSize( -1 ), mDefaultFontFamily(""), - mThemeFile( DEFAULT_THEME ), 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(); } @@ -124,43 +126,18 @@ StyleManager::~StyleManager() delete mFeedbackStyle; } -void StyleManager::SetOrientationValue( int orientation ) -{ - 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(); - } -} - -int StyleManager::GetOrientationValue() -{ - return mOrientationDegrees; -} - -void StyleManager::SetOrientation( Orientation orientation ) +void StyleManager::ApplyTheme( const std::string& themeFile ) { - 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; } @@ -182,24 +159,11 @@ bool StyleManager::GetStyleConstant( const std::string& key, Property::Value& va return false; } -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::ApplyThemeStyle( Toolkit::Control control ) { if( !mThemeBuilder ) { - RequestDefaultTheme(); + ApplyDefaultTheme(); } if( mThemeBuilder ) @@ -251,24 +215,39 @@ void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& json } } -Toolkit::StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal() +Toolkit::StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal() { - return mStyleChangeSignal; + return mStyleChangedSignal; } +Toolkit::StyleManager::StyleChangedSignalType& StyleManager::ControlStyleChangeSignal() +{ + return mControlStyleChangeSignal; +} -void StyleManager::SetTheme() +void StyleManager::SetTheme( const std::string& themeFile ) { + bool themeLoaded = false; + mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); - if( LoadJSON( mThemeBuilder, mThemeFile ) ) + // Always load the default theme first, then merge in the custom theme if present + themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME ); + + if( ! themeFile.empty() ) + { + mThemeFile = themeFile; + themeLoaded = LoadJSON( mThemeBuilder, mThemeFile ); + } + + if( themeLoaded ) { if(mFeedbackStyle) { mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE ); } - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE ); + EmitStyleChangeSignals(StyleChange::THEME_CHANGE); } else { @@ -313,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; @@ -354,34 +333,53 @@ 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(); + } while (!found); + + if(found) + { + styleName = qualifiedStyleName; + } + return found; +} + +void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control control ) +{ + std::string styleName = control.GetStyleName(); + if( GetStyleNameForControl( builder, control, styleName ) ) + { + builder.ApplyStyle( styleName, control ); } if( mDefaultFontSize >= 0 ) @@ -393,14 +391,20 @@ void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control contro } } -void StyleManager::OnOrientationChanged( Orientation orientation ) +const StylePtr StyleManager::GetRecordedStyle( Toolkit::Control control ) { - 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(); -} + if( mThemeBuilder ) + { + 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 ) { @@ -436,24 +440,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 ); +} - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange ); +void StyleManager::EmitStyleChangeSignals( StyleChange::Type styleChange ) +{ + Toolkit::StyleManager styleManager = StyleManager::Get(); + + // Update Controls first + mControlStyleChangeSignal.Emit( styleManager, styleChange ); + + // Inform application last + mStyleChangedSignal.Emit( styleManager, styleChange ); } + } // namespace Internal } // namespace Toolkit