add ExitHideItem to control whether text on the exit row shows
This commit is contained in:
@@ -2010,6 +2010,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X+20
|
|||||||
ItemsOnCommand=zoom,0.5
|
ItemsOnCommand=zoom,0.5
|
||||||
ItemGainFocusCommand=
|
ItemGainFocusCommand=
|
||||||
ItemLoseFocusCommand=
|
ItemLoseFocusCommand=
|
||||||
|
ExitHideItem=false
|
||||||
ColorSelected=color("1,1,1,1")
|
ColorSelected=color("1,1,1,1")
|
||||||
ColorNotSelected=color("0.5,0.5,0.5,1")
|
ColorNotSelected=color("0.5,0.5,0.5,1")
|
||||||
ColorDisabled=color("0.1,0.1,0.1,1")
|
ColorDisabled=color("0.1,0.1,0.1,1")
|
||||||
|
|||||||
@@ -22,7 +22,12 @@ RString OptionRow::GetThemedItemText( int iChoice ) const
|
|||||||
if( m_bFirstItemGoesDown && iChoice == 0 )
|
if( m_bFirstItemGoesDown && iChoice == 0 )
|
||||||
s = CommonMetrics::LocalizeOptionItem( NEXT_ROW_NAME, false );
|
s = CommonMetrics::LocalizeOptionItem( NEXT_ROW_NAME, false );
|
||||||
else if( m_RowType == OptionRow::RowType_Exit )
|
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 )
|
if( m_pParentType->CAPITALIZE_ALL_OPTION_NAMES )
|
||||||
s.MakeUpper();
|
s.MakeUpper();
|
||||||
@@ -94,6 +99,7 @@ void OptionRowType::Load( const RString &sType, Actor *pParent )
|
|||||||
ITEMS_ON_COMMAND .Load(sType,"ItemsOnCommand");
|
ITEMS_ON_COMMAND .Load(sType,"ItemsOnCommand");
|
||||||
ITEM_GAIN_FOCUS_COMMAND .Load(sType,"ItemGainFocusCommand");
|
ITEM_GAIN_FOCUS_COMMAND .Load(sType,"ItemGainFocusCommand");
|
||||||
ITEM_LOSE_FOCUS_COMMAND .Load(sType,"ItemLoseFocusCommand");
|
ITEM_LOSE_FOCUS_COMMAND .Load(sType,"ItemLoseFocusCommand");
|
||||||
|
EXIT_HIDE_ITEM .Load(sType,"ExitHideItem");
|
||||||
ICONS_X .Load(sType,ICONS_X_NAME,NUM_PLAYERS);
|
ICONS_X .Load(sType,ICONS_X_NAME,NUM_PLAYERS);
|
||||||
ICONS_ON_COMMAND .Load(sType,"IconsOnCommand");
|
ICONS_ON_COMMAND .Load(sType,"IconsOnCommand");
|
||||||
COLOR_SELECTED .Load(sType,"ColorSelected");
|
COLOR_SELECTED .Load(sType,"ColorSelected");
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ private:
|
|||||||
ThemeMetric<apActorCommands> ITEMS_ON_COMMAND;
|
ThemeMetric<apActorCommands> ITEMS_ON_COMMAND;
|
||||||
ThemeMetric<apActorCommands> ITEM_GAIN_FOCUS_COMMAND;
|
ThemeMetric<apActorCommands> ITEM_GAIN_FOCUS_COMMAND;
|
||||||
ThemeMetric<apActorCommands> ITEM_LOSE_FOCUS_COMMAND;
|
ThemeMetric<apActorCommands> ITEM_LOSE_FOCUS_COMMAND;
|
||||||
|
ThemeMetric<bool> EXIT_HIDE_ITEM;
|
||||||
ThemeMetric1D<float> ICONS_X;
|
ThemeMetric1D<float> ICONS_X;
|
||||||
ThemeMetric<apActorCommands> ICONS_ON_COMMAND;
|
ThemeMetric<apActorCommands> ICONS_ON_COMMAND;
|
||||||
ThemeMetric<RageColor> COLOR_SELECTED;
|
ThemeMetric<RageColor> COLOR_SELECTED;
|
||||||
|
|||||||
Reference in New Issue
Block a user