/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_STYLE");
+#endif
+
} // namespace
namespace Dali
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
+ loading = true;
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
- themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
+ themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME ); // Sets themeLoaded to true if theme exists
}
if( themeFile.compare(DEFAULT_THEME) != 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 )
{
}
else
{
+ DALI_LOG_STREAM( gLogFilter, Debug::Concise, "GetConfigurations() Loading default theme" );
+
bool themeLoaded = false;
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
{
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;
}