actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove THEME_ITEMS and THEME_TITLES. Always theme unless the OptionRowData has been marked !allowTheme

Browse Source
This commit is contained in:
Chris Danford
2005-11-30 04:32:33 +00:00
parent 557ae44dc7
commit 42f056dfdb
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+5 -6
View File
@@ -36,9 +36,9 @@ void OptionRow::PrepareItemText( CString &s ) const
bool bTheme = false;
// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
if( s == NEXT_ROW_NAME ) bTheme = true;
if( s == EXIT_NAME ) bTheme = true;
if( m_pParentType->THEME_ITEMS && m_RowDef.m_bAllowThemeItems ) bTheme = true;
if( s == NEXT_ROW_NAME ) bTheme = true;
if( s == EXIT_NAME ) bTheme = true;
if( m_RowDef.m_bAllowThemeItems ) bTheme = true;
if( bTheme )
s = CommonMetrics::ThemeOptionItem( s, false );
@@ -51,7 +51,8 @@ CString OptionRow::OptionTitle( CString s ) const
bool bTheme = false;
// HACK: Always theme the NEXT_ROW and EXIT items, even if metrics says not to theme.
if( m_pParentType->THEME_TITLES && m_RowDef.m_bAllowThemeTitles ) bTheme = true;
if( m_RowDef.m_bAllowThemeTitles )
bTheme = true;
return bTheme ? THEME->GetMetric("OptionTitles",s) : s;
}
@@ -132,8 +133,6 @@ void OptionRowType::Load( const CString &sType )
COLOR_DISABLED .Load(sType,"ColorDisabled");
CAPITALIZE_ALL_OPTION_NAMES .Load(sType,"CapitalizeAllOptionNames");
TWEEN_SECONDS .Load(sType,"TweenSeconds");
THEME_ITEMS .Load(sType,"ThemeItems");
THEME_TITLES .Load(sType,"ThemeTitles");
SHOW_BPM_IN_SPEED_TITLE .Load(sType,"ShowBpmInSpeedTitle");
SHOW_OPTION_ICONS .Load(sType,"ShowOptionIcons");
SHOW_UNDERLINES .Load(sType,"ShowUnderlines");