cleanup
allow overriding codes
This commit is contained in:
@@ -57,6 +57,7 @@ const int NUM_SCORE_DIGITS = 9;
|
|||||||
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric (m_sName,ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
|
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric (m_sName,ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
|
||||||
#define DO_ROULETTE_ON_MENU_TIMER THEME->GetMetricB(m_sName,"DoRouletteOnMenuTimer")
|
#define DO_ROULETTE_ON_MENU_TIMER THEME->GetMetricB(m_sName,"DoRouletteOnMenuTimer")
|
||||||
#define ALIGN_MUSIC_BEATS THEME->GetMetricB(m_sName,"AlignMusicBeat")
|
#define ALIGN_MUSIC_BEATS THEME->GetMetricB(m_sName,"AlignMusicBeat")
|
||||||
|
#define CODES THEME->GetMetric (m_sName,"Codes")
|
||||||
|
|
||||||
static const ScreenMessage SM_AllowOptionsMenuRepeat = ScreenMessage(SM_User+1);
|
static const ScreenMessage SM_AllowOptionsMenuRepeat = ScreenMessage(SM_User+1);
|
||||||
CString g_sFallbackCDTitlePath;
|
CString g_sFallbackCDTitlePath;
|
||||||
@@ -448,7 +449,6 @@ void ScreenSelectMusic::TweenCoursePartsOnScreen( bool Initial )
|
|||||||
m_CourseContentsFrame.SetZoomY( 1 );
|
m_CourseContentsFrame.SetZoomY( 1 );
|
||||||
if( Initial )
|
if( Initial )
|
||||||
{
|
{
|
||||||
m_CourseContentsFrame.Command( "ZoomY,0;BounceEnd,0.3;Zoom,1" );
|
|
||||||
COMMAND( m_CourseContentsFrame, "On" );
|
COMMAND( m_CourseContentsFrame, "On" );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -456,15 +456,12 @@ void ScreenSelectMusic::TweenCoursePartsOnScreen( bool Initial )
|
|||||||
m_CourseContentsFrame.SetFromCourse(NULL);
|
m_CourseContentsFrame.SetFromCourse(NULL);
|
||||||
COMMAND( m_CourseContentsFrame, "Show" );
|
COMMAND( m_CourseContentsFrame, "Show" );
|
||||||
}
|
}
|
||||||
// XXX: if !Initial, m_CourseContentsFrame.Hide?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenSelectMusic::TweenCoursePartsOffScreen( bool Final )
|
void ScreenSelectMusic::TweenCoursePartsOffScreen( bool Final )
|
||||||
{
|
{
|
||||||
if( Final )
|
if( Final )
|
||||||
{
|
{
|
||||||
m_CourseContentsFrame.SetZoomY( 1 );
|
|
||||||
m_CourseContentsFrame.Command( "BounceBegin,0.3;ZoomY,0" );
|
|
||||||
OFF_COMMAND( m_CourseContentsFrame );
|
OFF_COMMAND( m_CourseContentsFrame );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1044,6 +1041,12 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
case SM_SortOrderChanged: /* happens after the wheel is off and the new song is selected */
|
case SM_SortOrderChanged: /* happens after the wheel is off and the new song is selected */
|
||||||
SortOrderChanged();
|
SortOrderChanged();
|
||||||
break;
|
break;
|
||||||
|
case SM_GainFocus:
|
||||||
|
CodeDetector::RefreshCacheItems( CODES );
|
||||||
|
break;
|
||||||
|
case SM_LoseFocus:
|
||||||
|
CodeDetector::RefreshCacheItems(); /* reset for other screens */
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Screen::HandleScreenMessage( SM );
|
Screen::HandleScreenMessage( SM );
|
||||||
|
|||||||
Reference in New Issue
Block a user