diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 112c505b7e..6a5b4a9274 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2010,6 +2010,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X+20 ItemsOnCommand=zoom,0.5 ItemGainFocusCommand= ItemLoseFocusCommand= +ExitHideItem=false ColorSelected=color("1,1,1,1") ColorNotSelected=color("0.5,0.5,0.5,1") ColorDisabled=color("0.1,0.1,0.1,1") diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index e2b5dc1638..b57bc0dfd0 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -22,7 +22,12 @@ RString OptionRow::GetThemedItemText( int iChoice ) const if( m_bFirstItemGoesDown && iChoice == 0 ) s = CommonMetrics::LocalizeOptionItem( NEXT_ROW_NAME, false ); else if( m_RowType == OptionRow::RowType_Exit ) - s = CommonMetrics::LocalizeOptionItem( EXIT_NAME, false ); + { + if( m_pParentType->EXIT_HIDE_ITEM ) + s = RString(); + else + s = CommonMetrics::LocalizeOptionItem( EXIT_NAME, false ); + } if( m_pParentType->CAPITALIZE_ALL_OPTION_NAMES ) s.MakeUpper(); @@ -94,6 +99,7 @@ void OptionRowType::Load( const RString &sType, Actor *pParent ) ITEMS_ON_COMMAND .Load(sType,"ItemsOnCommand"); ITEM_GAIN_FOCUS_COMMAND .Load(sType,"ItemGainFocusCommand"); ITEM_LOSE_FOCUS_COMMAND .Load(sType,"ItemLoseFocusCommand"); + EXIT_HIDE_ITEM .Load(sType,"ExitHideItem"); ICONS_X .Load(sType,ICONS_X_NAME,NUM_PLAYERS); ICONS_ON_COMMAND .Load(sType,"IconsOnCommand"); COLOR_SELECTED .Load(sType,"ColorSelected"); @@ -279,7 +285,7 @@ void OptionRow::InitText() { RString sText = GetThemedItemText( c ); bt.SetText( sText ); - + fWidth += bt.GetZoomedWidth(); if( c != m_pHand->m_Def.m_vsChoices.size()-1 ) diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h index 2d5ce66951..c97596fe6e 100644 --- a/stepmania/src/OptionRow.h +++ b/stepmania/src/OptionRow.h @@ -44,6 +44,7 @@ private: ThemeMetric ITEMS_ON_COMMAND; ThemeMetric ITEM_GAIN_FOCUS_COMMAND; ThemeMetric ITEM_LOSE_FOCUS_COMMAND; + ThemeMetric EXIT_HIDE_ITEM; ThemeMetric1D ICONS_X; ThemeMetric ICONS_ON_COMMAND; ThemeMetric COLOR_SELECTED;