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

remove ExplanationZoom, use OnCommand instead

Browse Source
This commit is contained in:
Chris Danford
2005-12-03 20:49:43 +00:00
parent d33daeb6f9
commit 39f167f4aa
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+7 -4
View File
@@ -2426,10 +2426,9 @@ ExplanationP2X=SCREEN_CENTER_X+250
ExplanationP2Y=SCREEN_CENTER_Y+172 ExplanationP2Y=SCREEN_CENTER_Y+172
ExplanationTogetherX=SCREEN_CENTER_X-250 ExplanationTogetherX=SCREEN_CENTER_X-250
ExplanationTogetherY=SCREEN_CENTER_Y+172 ExplanationTogetherY=SCREEN_CENTER_Y+172
ExplanationTogetherOnCommand=wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOnCommand=zoom,0.5;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationZoom=0.5 ExplanationP1OnCommand=zoom,0.5;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationP1OnCommand=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
ExplanationP2OnCommand=wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
DisqualifyP1X= DisqualifyP1X=
DisqualifyP1Y= DisqualifyP1Y=
DisqualifyP1OnCommand=hidden,1 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 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 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() NextScreen=@SongSelectionScreen()
[ScreenOptionsManageEditSteps]
Class=ScreenOptionsManageEditSteps
Fallback=ScreenOptionsSimple
stepmania/src/ScreenOptions.cpp
-2
View File
@@ -88,7 +88,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"),
LINE_HIGHLIGHT_X (m_sName,"LineHighlightX"), LINE_HIGHLIGHT_X (m_sName,"LineHighlightX"),
EXPLANATION_ZOOM (m_sName,"ExplanationZoom"),
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"),
@@ -153,7 +152,6 @@ void ScreenOptions::Init()
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
m_textExplanation[p].LoadFromFont( THEME->GetPathF(m_sName,"explanation") ); m_textExplanation[p].LoadFromFont( THEME->GetPathF(m_sName,"explanation") );
m_textExplanation[p].SetZoom( EXPLANATION_ZOOM );
m_textExplanation[p].SetShadowLength( 0 ); m_textExplanation[p].SetShadowLength( 0 );
m_textExplanation[p].SetDrawOrder( 2 ); m_textExplanation[p].SetDrawOrder( 2 );
m_framePage.AddChild( &m_textExplanation[p] ); m_framePage.AddChild( &m_textExplanation[p] );
stepmania/src/ScreenOptions.h
-1
View File
@@ -154,7 +154,6 @@ protected:
ThemeMetric<float> SCROLL_BAR_HEIGHT; ThemeMetric<float> SCROLL_BAR_HEIGHT;
ThemeMetric<float> SCROLL_BAR_TIME; ThemeMetric<float> SCROLL_BAR_TIME;
ThemeMetric<float> LINE_HIGHLIGHT_X; ThemeMetric<float> LINE_HIGHLIGHT_X;
ThemeMetric<float> EXPLANATION_ZOOM;
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;