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

OptionRow: member name cleanup, add focus commands

Browse Source
This commit is contained in:
Chris Danford
2005-07-06 06:11:56 +00:00
parent 488c6e952e
commit 848d6c89e2
15 changed files with 334 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMiniMenu.cpp
+12 -8
View File
@@ -15,13 +15,15 @@
AutoScreenMessage( SM_GoToOK )
AutoScreenMessage( SM_GoToCancel )
bool ScreenMiniMenu::s_bCancelled = false;
int ScreenMiniMenu::s_iLastRowCode = -1;
vector<int> ScreenMiniMenu::s_viLastAnswers;
void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel )
void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY )
{
ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName );
pNewScreen->Init( pDef, SM_SendOnOK, SM_SendOnCancel );
pNewScreen->SetXY( fX, fY );
SCREENMAN->ZeroNextUpdate();
SCREENMAN->SetFromNewScreen( pNewScreen );
}
@@ -63,8 +65,8 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree
const MenuRowDef &mr = m_vMenuRows[r];
OptionRowDefinition &def = vDefs[r];
def.name = mr.sName;
FontCharAliases::ReplaceMarkers( def.name ); // Allow special characters
def.m_sName = mr.sName;
FontCharAliases::ReplaceMarkers( def.m_sName ); // Allow special characters
if( mr.bEnabled )
{
@@ -77,14 +79,14 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree
def.m_vEnabledForPlayers.clear();
}
def.bOneChoiceForAllPlayers = true;
def.selectType = SELECT_ONE;
def.layoutType = LAYOUT_SHOW_ONE_IN_ROW;
def.m_bOneChoiceForAllPlayers = true;
def.m_selectType = SELECT_ONE;
def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
def.m_bExportOnChange = false;
def.choices = mr.choices;
def.m_vsChoices = mr.choices;
FOREACH( CString, def.choices, c )
FOREACH( CString, def.m_vsChoices, c )
FontCharAliases::ReplaceMarkers( *c ); // Allow special characters
}
@@ -135,11 +137,13 @@ void ScreenMiniMenu::ExportOptions( int r, const vector<PlayerNumber> &vpns )
void ScreenMiniMenu::GoToNextScreen()
{
s_bCancelled = false;
SCREENMAN->PopTopScreen( m_SMSendOnOK );
}
void ScreenMiniMenu::GoToPrevScreen()
{
s_bCancelled = true;
SCREENMAN->PopTopScreen( m_SMSendOnCancel );
}