metric scheme update
This commit is contained in:
@@ -89,8 +89,6 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
|
|||||||
SCROLL_BAR_HEIGHT (m_sName,"ScrollBarHeight"),
|
SCROLL_BAR_HEIGHT (m_sName,"ScrollBarHeight"),
|
||||||
SCROLL_BAR_TIME (m_sName,"ScrollBarTime"),
|
SCROLL_BAR_TIME (m_sName,"ScrollBarTime"),
|
||||||
EXPLANATION_ZOOM (m_sName,"ExplanationZoom"),
|
EXPLANATION_ZOOM (m_sName,"ExplanationZoom"),
|
||||||
FRAME_ON_COMMAND (m_sName,"FrameOnCommand"),
|
|
||||||
FRAME_OFF_COMMAND (m_sName,"FrameOffCommand"),
|
|
||||||
SHOW_EXIT_ROW (m_sName,"ShowExitRow"),
|
SHOW_EXIT_ROW (m_sName,"ShowExitRow"),
|
||||||
SEPARATE_EXIT_ROW (m_sName,"SeparateExitRow"),
|
SEPARATE_EXIT_ROW (m_sName,"SeparateExitRow"),
|
||||||
SEPARATE_EXIT_ROW_Y (m_sName,"SeparateExitRowY"),
|
SEPARATE_EXIT_ROW_Y (m_sName,"SeparateExitRowY"),
|
||||||
@@ -116,6 +114,7 @@ void ScreenOptions::Init()
|
|||||||
m_SoundToggleOff.Load( THEME->GetPathS(m_sName,"toggle off"), true );
|
m_SoundToggleOff.Load( THEME->GetPathS(m_sName,"toggle off"), true );
|
||||||
|
|
||||||
// add everything to m_framePage so we can animate everything at once
|
// add everything to m_framePage so we can animate everything at once
|
||||||
|
m_framePage.SetName( "Frame" );
|
||||||
this->AddChild( &m_framePage );
|
this->AddChild( &m_framePage );
|
||||||
|
|
||||||
m_bMoreShown = false;
|
m_bMoreShown = false;
|
||||||
@@ -127,7 +126,7 @@ void ScreenOptions::Init()
|
|||||||
m_bGotAtLeastOneStartPressed[p] = false;
|
m_bGotAtLeastOneStartPressed[p] = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_framePage.RunCommands( FRAME_ON_COMMAND );
|
ON_COMMAND( m_framePage );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText )
|
void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText )
|
||||||
@@ -529,7 +528,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
|
|
||||||
SCREENMAN->PlayStartSound();
|
SCREENMAN->PlayStartSound();
|
||||||
|
|
||||||
m_framePage.RunCommands( FRAME_OFF_COMMAND );
|
OFF_COMMAND( m_framePage );
|
||||||
break;
|
break;
|
||||||
case SM_GainFocus:
|
case SM_GainFocus:
|
||||||
INPUTFILTER->SetRepeatRate( 0.25f, 12, 0.25f, 12 );
|
INPUTFILTER->SetRepeatRate( 0.25f, 12, 0.25f, 12 );
|
||||||
|
|||||||
@@ -135,8 +135,6 @@ protected:
|
|||||||
ThemeMetric<float> SCROLL_BAR_HEIGHT;
|
ThemeMetric<float> SCROLL_BAR_HEIGHT;
|
||||||
ThemeMetric<float> SCROLL_BAR_TIME;
|
ThemeMetric<float> SCROLL_BAR_TIME;
|
||||||
ThemeMetric<float> EXPLANATION_ZOOM;
|
ThemeMetric<float> EXPLANATION_ZOOM;
|
||||||
ThemeMetric<apActorCommands> FRAME_ON_COMMAND;
|
|
||||||
ThemeMetric<apActorCommands> FRAME_OFF_COMMAND;
|
|
||||||
ThemeMetric<bool> SHOW_EXIT_ROW;
|
ThemeMetric<bool> SHOW_EXIT_ROW;
|
||||||
ThemeMetric<bool> SEPARATE_EXIT_ROW;
|
ThemeMetric<bool> SEPARATE_EXIT_ROW;
|
||||||
ThemeMetric<float> SEPARATE_EXIT_ROW_Y;
|
ThemeMetric<float> SEPARATE_EXIT_ROW_Y;
|
||||||
|
|||||||
Reference in New Issue
Block a user