From 39f167f4aa48ac5945f2edc6812db30ed88e4784 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 3 Dec 2005 20:49:43 +0000 Subject: [PATCH] remove ExplanationZoom, use OnCommand instead --- stepmania/Themes/default/metrics.ini | 11 +++++++---- stepmania/src/ScreenOptions.cpp | 2 -- stepmania/src/ScreenOptions.h | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index f55b6dd350..72c8313460 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -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 diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 73be7468af..48f14b0364 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -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] ); diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 6d8754e31c..2875badbcd 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -154,7 +154,6 @@ protected: ThemeMetric SCROLL_BAR_HEIGHT; ThemeMetric SCROLL_BAR_TIME; ThemeMetric LINE_HIGHLIGHT_X; - ThemeMetric EXPLANATION_ZOOM; ThemeMetric SHOW_EXIT_ROW; ThemeMetric SEPARATE_EXIT_ROW; ThemeMetric SEPARATE_EXIT_ROW_Y;