projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes after converting StyleChange to an enum
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
styling
/
style-manager-impl.cpp
diff --git
a/dali-toolkit/internal/styling/style-manager-impl.cpp
b/dali-toolkit/internal/styling/style-manager-impl.cpp
index
69eee7b
..
814421e
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/
dali-toolkit/internal/styling/style-manager-impl.cpp
@@
-358,9
+358,7
@@
void StyleManager::SetTheme()
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
if ( LoadJSON( mThemeBuilder, mThemeFile ) )
{
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
if ( LoadJSON( mThemeBuilder, mThemeFile ) )
{
- StyleChange change;
- change.themeChange = true;
- mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change );
+ mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE );
}
else
{
}
else
{
@@
-384,25
+382,36
@@
void StyleManager::CacheBuilder( Toolkit::Builder builder, const std::string& ke
mBuilderCache[ key ] = builder;
}
mBuilderCache[ key ] = builder;
}
-void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange )
+void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange
::Type
styleChange )
{
{
-
if( styleChange.defaultFontSiz
eChange )
+
switch ( styl
eChange )
{
{
- mDefaultFontSize = styleMonitor.GetDefaultFontSize();
- }
-
- if( styleChange.themeChange )
- {
- if( ! styleChange.themeFilePath.empty() )
+ case StyleChange::DEFAULT_FONT_CHANGE:
{
{
-
mThemeFile = styleChange.themeFilePath
;
+
break
;
}
}
- else
+
+ case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
{
{
- mThemeFile = DEFAULT_THEME;
+ mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+ break;
}
}
- SetTheme();
+ case StyleChange::THEME_CHANGE:
+ {
+ const std::string& newTheme = styleMonitor.GetTheme();
+ if( ! newTheme.empty() )
+ {
+ mThemeFile = newTheme;
+ }
+ else
+ {
+ mThemeFile = DEFAULT_THEME;
+ }
+
+ SetTheme();
+ break;
+ }
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );