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

move "bFirstChoiceGoesDown back to first choice" logic into AfterChangeRow

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-03 06:16:38 +00:00
parent 652536ea83
commit 441d23cbc9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+11 -10
View File
@@ -1140,13 +1140,6 @@ bool ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool bRepeat )
const int iCurrentRow = m_iCurrentRow[pn]; const int iCurrentRow = m_iCurrentRow[pn];
OptionRow &row = *m_pRows[iCurrentRow]; OptionRow &row = *m_pRows[iCurrentRow];
if( row.GetFirstItemGoesDown() )
{
// If moving from a bFirstChoiceGoesDown row, put focus back on
// the first choice before moving.
row.SetChoiceInRowWithFocus( pn, 0 );
}
LOG->Trace("move pn %i, dir %i, rep %i", pn, iDir, bRepeat); LOG->Trace("move pn %i, dir %i, rep %i", pn, iDir, bRepeat);
bool bChanged = false; bool bChanged = false;
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
@@ -1178,12 +1171,12 @@ bool ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool bRepeat )
void ScreenOptions::AfterChangeRow( PlayerNumber pn ) void ScreenOptions::AfterChangeRow( PlayerNumber pn )
{ {
//
// In FIVE_KEY, keep the selection in the row near the focus.
//
const int iRow = m_iCurrentRow[pn]; const int iRow = m_iCurrentRow[pn];
if( iRow != -1 ) if( iRow != -1 )
{ {
//
// In FIVE_KEY, keep the selection in the row near the focus.
//
OptionRow &row = *m_pRows[iRow]; OptionRow &row = *m_pRows[iRow];
switch( m_OptionsNavigation ) switch( m_OptionsNavigation )
{ {
@@ -1205,6 +1198,14 @@ void ScreenOptions::AfterChangeRow( PlayerNumber pn )
} }
break; break;
} }
if( row.GetFirstItemGoesDown() )
{
// If moving to a bFirstChoiceGoesDown row, put focus back on
// the first choice.
row.SetChoiceInRowWithFocus( pn, 0 );
}
} }
AfterChangeValueOrRow( pn ); AfterChangeValueOrRow( pn );