void StyleManager::ApplyDefaultTheme()
{
- std::string empty;
- SetTheme( empty );
+ SetTheme( DEFAULT_THEME );
}
const std::string& StyleManager::GetDefaultFontFamily() const
// Always load the default theme first, then merge in the custom theme if present
themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
+ mThemeFile = themeFile;
- if( ! themeFile.empty() )
+ if( themeFile.compare(DEFAULT_THEME) != 0 )
{
- mThemeFile = themeFile;
themeLoaded = LoadJSON( mThemeBuilder, mThemeFile );
}