I'm not sure why this ClearSubscribers was here; it's causing

metrics to not be loaded after a resolution change, because
the reload is optimized out by SwitchThemeAndLanguage.
(We may have loaded ThemeMetrics on demand in the
past.)

The reload needs to always happen, even though the theme
hasn't changed, since the theme load is affected by the
resolution; eg. upvalues in Lua scripts may have been
computed based on SCREEN_WIDTH.
This commit is contained in:
Glenn Maynard
2007-02-11 01:52:41 +00:00
parent b88d415b52
commit ee061be26a
5 changed files with 13 additions and 14 deletions
+3 -4
View File
@@ -345,7 +345,7 @@ RString ThemeManager::GetDefaultLanguage()
return sLangCode;
}
bool ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RString &sLanguage_, bool bPseudoLocalize )
void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RString &sLanguage_, bool bPseudoLocalize, bool bForceThemeReload )
{
RString sThemeName = sThemeName_;
RString sLanguage = sLanguage_;
@@ -366,8 +366,8 @@ bool ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
sThemeName.c_str(), sLanguage.c_str() );
bool bNothingChanging = sThemeName == m_sCurThemeName && sLanguage == m_sCurLanguage && m_bPseudoLocalize == bPseudoLocalize;
if( bNothingChanging )
return false;
if( bNothingChanging && !bForceThemeReload )
return;
m_bPseudoLocalize = bPseudoLocalize;
@@ -397,7 +397,6 @@ bool ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
LocalizedString::RegisterLocalizer( LocalizedStringImplThemeMetric::Create );
ReloadSubscribers();
return true;
}
void ThemeManager::ReloadSubscribers()