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

move NAV_TOGGLE_FIVE_KEY focus handling into AfterChangeRow

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-03 06:02:17 +00:00
parent 35408c5ed6
commit afa74ef150
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+26 -25
View File
@@ -1172,31 +1172,6 @@ bool ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool Repeat )
m_iCurrentRow[p] = r; m_iCurrentRow[p] = r;
ASSERT( r >= 0 && r < (int)m_pRows.size() ); ASSERT( r >= 0 && r < (int)m_pRows.size() );
//
// We've moved vertically. In FIVE_KEY, keep the selection in the row near the focus.
//
OptionRow &row = *m_pRows[r];
switch( m_OptionsNavigation )
{
case NAV_TOGGLE_FIVE_KEY:
if( row.GetRowDef().m_layoutType != LAYOUT_SHOW_ONE_IN_ROW )
{
int iSelectionDist = -1;
for( unsigned i = 0; i < row.GetTextItemsSize(); ++i )
{
int iWidth, iX, iY;
GetWidthXY( p, m_iCurrentRow[p], i, iWidth, iX, iY );
const int iDist = abs( iX-m_iFocusX[p] );
if( iSelectionDist == -1 || iDist < iSelectionDist )
{
iSelectionDist = iDist;
row.SetChoiceInRowWithFocus( p, i );
}
}
}
break;
}
AfterChangeRow( p ); AfterChangeRow( p );
bChanged = true; bChanged = true;
} }
@@ -1206,6 +1181,32 @@ bool ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool Repeat )
void ScreenOptions::AfterChangeRow( PlayerNumber pn ) void ScreenOptions::AfterChangeRow( PlayerNumber pn )
{ {
//
// In FIVE_KEY, keep the selection in the row near the focus.
//
OptionRow &row = *m_pRows[r];
switch( m_OptionsNavigation )
{
case NAV_TOGGLE_FIVE_KEY:
if( row.GetRowDef().m_layoutType != LAYOUT_SHOW_ONE_IN_ROW )
{
int iSelectionDist = -1;
for( unsigned i = 0; i < row.GetTextItemsSize(); ++i )
{
int iWidth, iX, iY;
GetWidthXY( pn, m_iCurrentRow[pn], i, iWidth, iX, iY );
const int iDist = abs( iX-m_iFocusX[pn] );
if( iSelectionDist == -1 || iDist < iSelectionDist )
{
iSelectionDist = iDist;
row.SetChoiceInRowWithFocus( pn, i );
}
}
}
break;
}
AfterChangeValueOrRow( pn ); AfterChangeValueOrRow( pn );
} }