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

LABEL_ -> TITLE_

Browse Source
This commit is contained in:
Chris Danford
2005-12-06 04:21:00 +00:00
parent 9f6d6067fe
commit 1c0dc2aad8
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+11 -8
View File
@@ -63,6 +63,9 @@ CString OptionRow::OptionTitle( CString s ) const
if( m_RowDef.m_bAllowThemeTitle ) if( m_RowDef.m_bAllowThemeTitle )
bTheme = true; bTheme = true;
if( s.empty() )
return s;
return bTheme ? THEME->GetMetric("OptionTitles",s) : s; return bTheme ? THEME->GetMetric("OptionTitles",s) : s;
} }
@@ -123,10 +126,10 @@ void OptionRowType::Load( const CString &sType )
BULLET_X .Load(sType,"BulletX"); BULLET_X .Load(sType,"BulletX");
BULLET_ON_COMMAND .Load(sType,"BulletOnCommand"); BULLET_ON_COMMAND .Load(sType,"BulletOnCommand");
LABELS_X .Load(sType,"LabelsX"); TITLE_X .Load(sType,"TitleX");
LABELS_ON_COMMAND .Load(sType,"LabelsOnCommand"); TITLE_ON_COMMAND .Load(sType,"TitleOnCommand");
LABEL_GAIN_FOCUS_COMMAND .Load(sType,"LabelGainFocusCommand"); TITLE_GAIN_FOCUS_COMMAND .Load(sType,"TitleGainFocusCommand");
LABEL_LOSE_FOCUS_COMMAND .Load(sType,"LabelLoseFocusCommand"); TITLE_LOSE_FOCUS_COMMAND .Load(sType,"TitleLoseFocusCommand");
ITEMS_START_X .Load(sType,"ItemsStartX"); ITEMS_START_X .Load(sType,"ItemsStartX");
ITEMS_END_X .Load(sType,"ItemsEndX"); ITEMS_END_X .Load(sType,"ItemsEndX");
ITEMS_GAP_X .Load(sType,"ItemsGapX"); ITEMS_GAP_X .Load(sType,"ItemsGapX");
@@ -399,8 +402,8 @@ void OptionRow::InitText()
{ {
case OptionRow::ROW_NORMAL: case OptionRow::ROW_NORMAL:
m_textTitle->SetText( GetRowTitle() ); m_textTitle->SetText( GetRowTitle() );
m_textTitle->SetX( m_pParentType->LABELS_X ); m_textTitle->SetX( m_pParentType->TITLE_X );
m_textTitle->RunCommands( m_pParentType->LABELS_ON_COMMAND ); m_textTitle->RunCommands( m_pParentType->TITLE_ON_COMMAND );
m_sprBullet->SetX( m_pParentType->BULLET_X ); m_sprBullet->SetX( m_pParentType->BULLET_X );
m_sprBullet->RunCommands( m_pParentType->BULLET_ON_COMMAND ); m_sprBullet->RunCommands( m_pParentType->BULLET_ON_COMMAND );
@@ -608,9 +611,9 @@ void OptionRow::UpdateEnabledDisabled()
} }
if( bThisRowHasFocusByAny ) if( bThisRowHasFocusByAny )
m_textTitle->RunCommands( m_pParentType->LABEL_GAIN_FOCUS_COMMAND ); m_textTitle->RunCommands( m_pParentType->TITLE_GAIN_FOCUS_COMMAND );
else else
m_textTitle->RunCommands( m_pParentType->LABEL_LOSE_FOCUS_COMMAND ); m_textTitle->RunCommands( m_pParentType->TITLE_LOSE_FOCUS_COMMAND );
/* Don't tween selection colors at all. */ /* Don't tween selection colors at all. */
RageColor color; RageColor color;
stepmania/src/OptionRow.h
+4 -4
View File
@@ -103,10 +103,10 @@ private:
// metrics // metrics
ThemeMetric<float> BULLET_X; ThemeMetric<float> BULLET_X;
ThemeMetric<apActorCommands> BULLET_ON_COMMAND; ThemeMetric<apActorCommands> BULLET_ON_COMMAND;
ThemeMetric<float> LABELS_X; ThemeMetric<float> TITLE_X;
ThemeMetric<apActorCommands> LABELS_ON_COMMAND; ThemeMetric<apActorCommands> TITLE_ON_COMMAND;
ThemeMetric<apActorCommands> LABEL_GAIN_FOCUS_COMMAND; ThemeMetric<apActorCommands> TITLE_GAIN_FOCUS_COMMAND;
ThemeMetric<apActorCommands> LABEL_LOSE_FOCUS_COMMAND; ThemeMetric<apActorCommands> TITLE_LOSE_FOCUS_COMMAND;
ThemeMetric<float> ITEMS_START_X; ThemeMetric<float> ITEMS_START_X;
ThemeMetric<float> ITEMS_END_X; ThemeMetric<float> ITEMS_END_X;
ThemeMetric<float> ITEMS_GAP_X; ThemeMetric<float> ITEMS_GAP_X;