Options row labels metrics cleanup

stepmania/Themes/default/metrics.ini

@@ -2412,8 +2412,7 @@ IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 ArrowsX=SCREEN_CENTER_X-232
 LabelsX=SCREEN_CENTER_X-180
-LabelsZoom=0.7
-LabelsHAlign=2	// 0,1,2 = left,center,right
+LabelsOnCommand=zoom,0.7;horizalign,right;ShadowLength,0
 NumRowsShown=10
 Row1Y=SCREEN_CENTER_Y-152+34*0
 Row2Y=SCREEN_CENTER_Y-152+34*1

stepmania/src/ScreenOptions.cpp

@@ -77,8 +77,7 @@ CString EXPLANATION_ON_COMMAND_NAME( size_t p )	{ return ssprintf("ExplanationP%
 ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName),
 	ARROWS_X   						(m_sName,"ArrowsX"),
 	LABELS_X						(m_sName,"LabelsX"),
-	LABELS_ZOOM						(m_sName,"LabelsZoom"),
-	LABELS_H_ALIGN					(m_sName,"LabelsHAlign"),
+	LABELS_ON_COMMAND				(m_sName,"LabelsOnCommand"),
 	NUM_ROWS_SHOWN					(m_sName,"NumRowsShown"),
 	ROW_Y							(m_sName,ROW_Y_NAME,NUM_ROWS_SHOWN),
 	ITEMS_ZOOM						(m_sName,"ItemsZoom"),
@@ -620,10 +619,7 @@ void ScreenOptions::InitOptionsText()
 		const CString sText = GetExplanationTitle( i );
 		title.SetText( sText );
 		title.SetXY( LABELS_X, fY );
-		title.SetZoom( LABELS_ZOOM );
-		title.SetHorizAlign( (Actor::HorizAlign)(int)LABELS_H_ALIGN );
-		title.SetVertAlign( Actor::align_middle );		
-		title.SetShadowLength( 0 );		
+		title.RunCommands( LABELS_ON_COMMAND );
 
 		Sprite &bullet = row.m_sprBullet;
 		bullet.Load( THEME->GetPathG(m_sName,"bullet") );

stepmania/src/ScreenOptions.h

@@ -115,8 +115,7 @@ protected:
 	// metrics
 	ThemeMetric<float>				ARROWS_X;
 	ThemeMetric<float>				LABELS_X;
-	ThemeMetric<float>				LABELS_ZOOM;
-	ThemeMetric<int>				LABELS_H_ALIGN;
+	ThemeMetric<apActorCommands>	LABELS_ON_COMMAND;
 	ThemeMetric<int>				NUM_ROWS_SHOWN;
 	ThemeMetric1D<float>			ROW_Y;
 	ThemeMetric<float>				ITEMS_ZOOM;