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

hard-coded -> metric

Browse Source
This commit is contained in:
Chris Danford
2005-02-09 07:50:30 +00:00
parent 73813115d3
commit 6c79849720
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+3
View File
@@ -2465,6 +2465,9 @@ ItemsZoom=0.5
ItemsStartX=SCREEN_CENTER_X-160 ItemsStartX=SCREEN_CENTER_X-160
ItemsEndX=SCREEN_CENTER_X+280 ItemsEndX=SCREEN_CENTER_X+280
ItemsGapX=14 ItemsGapX=14
ItemsLongRowP1X=260
ItemsLongRowP2X=420
ItemsLongRowSharedX=340
ItemsStartY=SCREEN_CENTER_Y-152 ItemsStartY=SCREEN_CENTER_Y-152
ItemsSpacingY=34 ItemsSpacingY=34
ExplanationP1X=SCREEN_CENTER_X-250 ExplanationP1X=SCREEN_CENTER_X-250
stepmania/src/ScreenOptions.cpp
+5 -5
View File
@@ -16,8 +16,8 @@
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "Command.h" #include "Command.h"
const float ITEM_X[NUM_PLAYERS] = { 260, 420 }; #define ITEMS_LONG_ROW_SHARED_X THEME->GetMetricF(m_sName,"ItemsLongRowSharedX")
#define ITEMS_LONG_ROW_X( p ) THEME->GetMetricF(m_sName,ssprintf("ItemsLongRowP%dX",p+1))
#define ICONS_X( p ) THEME->GetMetricF(m_sName,ssprintf("IconsP%dX",p+1)) #define ICONS_X( p ) THEME->GetMetricF(m_sName,ssprintf("IconsP%dX",p+1))
#define EXPLANATION_X(p) THEME->GetMetricF(m_sName,ssprintf("ExplanationP%dX",p+1)) #define EXPLANATION_X(p) THEME->GetMetricF(m_sName,ssprintf("ExplanationP%dX",p+1))
#define EXPLANATION_Y(p) THEME->GetMetricF(m_sName,ssprintf("ExplanationP%dY",p+1)) #define EXPLANATION_Y(p) THEME->GetMetricF(m_sName,ssprintf("ExplanationP%dY",p+1))
@@ -324,12 +324,12 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum
if( optline.bOneChoiceForAllPlayers ) if( optline.bOneChoiceForAllPlayers )
{ {
bt->SetX( truncf((ITEM_X[0]+ITEM_X[1])/2) ); // center the item bt->SetX( ITEMS_LONG_ROW_SHARED_X );
break; // only initialize one item since it's shared break; // only initialize one item since it's shared
} }
else else
{ {
bt->SetX( ITEM_X[p] ); bt->SetX( ITEMS_LONG_ROW_X(p) );
} }
} }
@@ -369,7 +369,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum
bt->SetText( THEME->GetMetric("OptionNames","Exit") ); bt->SetText( THEME->GetMetric("OptionNames","Exit") );
bt->SetZoom( ITEMS_ZOOM ); bt->SetZoom( ITEMS_ZOOM );
bt->SetShadowLength( 0 ); bt->SetShadowLength( 0 );
bt->SetX( SCREEN_CENTER_X ); bt->SetX( ITEMS_LONG_ROW_SHARED_X );
m_framePage.AddChild( bt ); m_framePage.AddChild( bt );