remove ExplanationZoom, use OnCommand instead
This commit is contained in:
@@ -2426,10 +2426,9 @@ ExplanationP2X=SCREEN_CENTER_X+250
|
||||
ExplanationP2Y=SCREEN_CENTER_Y+172
|
||||
ExplanationTogetherX=SCREEN_CENTER_X-250
|
||||
ExplanationTogetherY=SCREEN_CENTER_Y+172
|
||||
ExplanationTogetherOnCommand=wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
|
||||
ExplanationZoom=0.5
|
||||
ExplanationP1OnCommand=wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
|
||||
ExplanationP2OnCommand=wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
|
||||
ExplanationTogetherOnCommand=zoom,0.5;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
|
||||
ExplanationP1OnCommand=zoom,0.5;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
|
||||
ExplanationP2OnCommand=zoom,0.5;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
|
||||
DisqualifyP1X=
|
||||
DisqualifyP1Y=
|
||||
DisqualifyP1OnCommand=hidden,1
|
||||
@@ -4566,3 +4565,7 @@ LabelOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = ite
|
||||
LineOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y+indexOffset*36+6); self:draworder(itemIndex); end
|
||||
BulletOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X-246); self:y(SCREEN_CENTER_Y+indexOffset*36+6); end
|
||||
NextScreen=@SongSelectionScreen()
|
||||
|
||||
[ScreenOptionsManageEditSteps]
|
||||
Class=ScreenOptionsManageEditSteps
|
||||
Fallback=ScreenOptionsSimple
|
||||
|
||||
@@ -88,7 +88,6 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
|
||||
SCROLL_BAR_HEIGHT (m_sName,"ScrollBarHeight"),
|
||||
SCROLL_BAR_TIME (m_sName,"ScrollBarTime"),
|
||||
LINE_HIGHLIGHT_X (m_sName,"LineHighlightX"),
|
||||
EXPLANATION_ZOOM (m_sName,"ExplanationZoom"),
|
||||
SHOW_EXIT_ROW (m_sName,"ShowExitRow"),
|
||||
SEPARATE_EXIT_ROW (m_sName,"SeparateExitRow"),
|
||||
SEPARATE_EXIT_ROW_Y (m_sName,"SeparateExitRowY"),
|
||||
@@ -153,7 +152,6 @@ void ScreenOptions::Init()
|
||||
FOREACH_PlayerNumber( p )
|
||||
{
|
||||
m_textExplanation[p].LoadFromFont( THEME->GetPathF(m_sName,"explanation") );
|
||||
m_textExplanation[p].SetZoom( EXPLANATION_ZOOM );
|
||||
m_textExplanation[p].SetShadowLength( 0 );
|
||||
m_textExplanation[p].SetDrawOrder( 2 );
|
||||
m_framePage.AddChild( &m_textExplanation[p] );
|
||||
|
||||
@@ -154,7 +154,6 @@ protected:
|
||||
ThemeMetric<float> SCROLL_BAR_HEIGHT;
|
||||
ThemeMetric<float> SCROLL_BAR_TIME;
|
||||
ThemeMetric<float> LINE_HIGHLIGHT_X;
|
||||
ThemeMetric<float> EXPLANATION_ZOOM;
|
||||
ThemeMetric<bool> SHOW_EXIT_ROW;
|
||||
ThemeMetric<bool> SEPARATE_EXIT_ROW;
|
||||
ThemeMetric<float> SEPARATE_EXIT_ROW_Y;
|
||||
|
||||
Reference in New Issue
Block a user