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

if the wheel is locked, don't allow Ctrl+Letter to sort

Browse Source
This commit is contained in:
AJ Kelly
2010-01-13 00:43:21 +00:00
parent bc331f3fc6
commit 8ceb0a6967
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+15 -11
View File
@@ -359,22 +359,26 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) ) if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) )
{ {
SortOrder so = GAMESTATE->m_SortOrder; // Don't change sort order when the wheel is locked.
if ( ( so != SORT_TITLE ) && ( so != SORT_ARTIST ) ) if( !m_MusicWheel.WheelIsLocked() )
{ {
so = SORT_TITLE; SortOrder so = GAMESTATE->m_SortOrder;
if ( ( so != SORT_TITLE ) && ( so != SORT_ARTIST ) )
{
so = SORT_TITLE;
GAMESTATE->m_PreferredSortOrder = so; GAMESTATE->m_PreferredSortOrder = so;
GAMESTATE->m_SortOrder.Set( so ); GAMESTATE->m_SortOrder.Set( so );
// Odd, changing the sort order requires us to call SetOpenSection more than once // Odd, changing the sort order requires us to call SetOpenSection more than once
m_MusicWheel.ChangeSort( so );
m_MusicWheel.SetOpenSection( ssprintf("%c", c ) );
}
m_MusicWheel.SelectSection( ssprintf("%c", c ) );
m_MusicWheel.ChangeSort( so ); m_MusicWheel.ChangeSort( so );
m_MusicWheel.SetOpenSection( ssprintf("%c", c ) ); m_MusicWheel.SetOpenSection( ssprintf("%c", c ) );
AfterMusicChange();
return;
} }
m_MusicWheel.SelectSection( ssprintf("%c", c ) );
m_MusicWheel.ChangeSort( so );
m_MusicWheel.SetOpenSection( ssprintf("%c", c ) );
AfterMusicChange();
return;
} }
// debugging? // debugging?