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

Options row labels metrics cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-02-13 07:16:30 +00:00
parent b4327b8daf
commit a4fc150692
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1 -2
View File
@@ -2412,8 +2412,7 @@ IconsP1X=SCREEN_CENTER_X-280
IconsP2X=SCREEN_CENTER_X+280 IconsP2X=SCREEN_CENTER_X+280
ArrowsX=SCREEN_CENTER_X-232 ArrowsX=SCREEN_CENTER_X-232
LabelsX=SCREEN_CENTER_X-180 LabelsX=SCREEN_CENTER_X-180
LabelsZoom=0.7 LabelsOnCommand=zoom,0.7;horizalign,right;ShadowLength,0
LabelsHAlign=2 // 0,1,2 = left,center,right
NumRowsShown=10 NumRowsShown=10
Row1Y=SCREEN_CENTER_Y-152+34*0 Row1Y=SCREEN_CENTER_Y-152+34*0
Row2Y=SCREEN_CENTER_Y-152+34*1 Row2Y=SCREEN_CENTER_Y-152+34*1
stepmania/src/ScreenOptions.cpp
+2 -6
View File
@@ -77,8 +77,7 @@ CString EXPLANATION_ON_COMMAND_NAME( size_t p ) { return ssprintf("ExplanationP%
ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName), ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName),
ARROWS_X (m_sName,"ArrowsX"), ARROWS_X (m_sName,"ArrowsX"),
LABELS_X (m_sName,"LabelsX"), LABELS_X (m_sName,"LabelsX"),
LABELS_ZOOM (m_sName,"LabelsZoom"), LABELS_ON_COMMAND (m_sName,"LabelsOnCommand"),
LABELS_H_ALIGN (m_sName,"LabelsHAlign"),
NUM_ROWS_SHOWN (m_sName,"NumRowsShown"), NUM_ROWS_SHOWN (m_sName,"NumRowsShown"),
ROW_Y (m_sName,ROW_Y_NAME,NUM_ROWS_SHOWN), ROW_Y (m_sName,ROW_Y_NAME,NUM_ROWS_SHOWN),
ITEMS_ZOOM (m_sName,"ItemsZoom"), ITEMS_ZOOM (m_sName,"ItemsZoom"),
@@ -620,10 +619,7 @@ void ScreenOptions::InitOptionsText()
const CString sText = GetExplanationTitle( i ); const CString sText = GetExplanationTitle( i );
title.SetText( sText ); title.SetText( sText );
title.SetXY( LABELS_X, fY ); title.SetXY( LABELS_X, fY );
title.SetZoom( LABELS_ZOOM ); title.RunCommands( LABELS_ON_COMMAND );
title.SetHorizAlign( (Actor::HorizAlign)(int)LABELS_H_ALIGN );
title.SetVertAlign( Actor::align_middle );
title.SetShadowLength( 0 );
Sprite &bullet = row.m_sprBullet; Sprite &bullet = row.m_sprBullet;
bullet.Load( THEME->GetPathG(m_sName,"bullet") ); bullet.Load( THEME->GetPathG(m_sName,"bullet") );
stepmania/src/ScreenOptions.h
+1 -2
View File
@@ -115,8 +115,7 @@ protected:
// metrics // metrics
ThemeMetric<float> ARROWS_X; ThemeMetric<float> ARROWS_X;
ThemeMetric<float> LABELS_X; ThemeMetric<float> LABELS_X;
ThemeMetric<float> LABELS_ZOOM; ThemeMetric<apActorCommands> LABELS_ON_COMMAND;
ThemeMetric<int> LABELS_H_ALIGN;
ThemeMetric<int> NUM_ROWS_SHOWN; ThemeMetric<int> NUM_ROWS_SHOWN;
ThemeMetric1D<float> ROW_Y; ThemeMetric1D<float> ROW_Y;
ThemeMetric<float> ITEMS_ZOOM; ThemeMetric<float> ITEMS_ZOOM;