Various metrics changes to RoomWheel: Desc is now Description, Width metrics are removed, and hardcoded commands (halign,0;shadowlength,0;maxwidth,[width metric]) are removed.

Docs/Changelog_sm-ssc.txt

@@ -20,6 +20,10 @@ sm-ssc in development | 20110???
 * Removed Song sample length limitations. [freem]
 * Removed hard-coded values from the Step Editor. Now TimeSignatures are used
   in place of these former constants. [Wolfman2000]
+* [RoomWheel] Various metrics changes: [freem]
+  * Removed TextWidth/DescWidth metrics.
+  * "Desc" is now "Description". (DescX -> DescriptionX)
+  * Removed hardcoded commands (shadowlength,0;maxwidth,[max width metric];halign,0).
 
 ================================================================================
 sm-ssc v1.2 | 20110107

Themes/_fallback/metrics.ini

@@ -3872,14 +3872,13 @@ CreateRoomColor=color("0.0,0.9,0.25,1.0")
 ScrollBarOnCommand=visible,false
 
 [RoomWheelItem]
-TextOnCommand=zoom,0.6;strokecolor,color("#000000FF")
 TextX=-110
 TextY=-8
-TextWidth=200
+TextOnCommand=halign,0;zoom,0.6;maxwidth,200;strokecolor,color("#000000FF");
-DescX=-100
+
-DescY=6
+DescriptionX=-100
-DescOnCommand=zoom,0.4;strokecolor,color("#000000FF")
+DescriptionY=6
-DescWidth=400
+DescriptionOnCommand=halign,0;zoom,0.4;maxwidth,400;strokecolor,color("#000000FF")
 
 [RoomInfoDisplay]
 RoomInfoDisplayOnCommand=diffuse,color("1.0,1.0,1.0,1");x,SCREEN_WIDTH+130;y,250;bounceend,0.5;x,SCREEN_WIDTH-160

src/RoomWheel.cpp

@@ -12,15 +12,6 @@ AutoScreenMessage( SM_BackFromRoomName )
 AutoScreenMessage( SM_RoomInfoRetract )
 AutoScreenMessage( SM_RoomInfoDeploy )
 
-ThemeMetric<float>		TEXT_X;
-ThemeMetric<float>		TEXT_Y;
-ThemeMetric<float>		TEXT_WIDTH;
-ThemeMetric<apActorCommands>	TEXT_ON_COMMAND;
-
-ThemeMetric<float>	DESC_X;
-ThemeMetric<float>	DESC_Y;
-ThemeMetric<float>	DESC_WIDTH;
-
 RoomWheel::~RoomWheel()
 {
 	FOREACH( WheelItemBaseData*, m_CurWheelItemData, i )
@@ -80,33 +71,15 @@ void RoomWheelItem::Load( RString sType )
 	m_sprNormalPart.Load( THEME->GetPathG(sType,"NormalPart") );
 	this->AddChild( m_sprNormalPart );
 
-	TEXT_X			.Load(sType,"TextX");
+	m_text.SetName( "Text" );
-	TEXT_Y			.Load(sType,"TextY");
-	TEXT_ON_COMMAND	.Load(sType,"TextOnCommand");
-	TEXT_WIDTH	.Load(sType,"TextWidth");
-
 	m_text.LoadFromFont( THEME->GetPathF(sType,"text") );
-	//m_text.SetShadowLength( 0 );
+	LOAD_ALL_COMMANDS_AND_SET_XY( m_text );
-	m_text.SetXY( TEXT_X, TEXT_Y );
-	m_text.RunCommands( TEXT_ON_COMMAND );
 	this->AddChild( &m_text );
-	m_text.SetHorizAlign( align_left );
-	m_text.SetMaxWidth(TEXT_WIDTH);
 
-	/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
+	m_Desc.SetName( "Description" );
-
-	DESC_X		.Load(sType,"DescX");
-	DESC_Y		.Load(sType,"DescY");
-	DESC_WIDTH	.Load(sType,"DescWidth");
-
-	m_Desc.SetName( "Desc" );
 	ActorUtil::LoadAllCommands( m_Desc, "RoomWheelItem" );
 	m_Desc.LoadFromFont( THEME->GetPathF("RoomWheel","text") );
-	m_Desc.SetHorizAlign( align_left );
+	LOAD_ALL_COMMANDS_AND_SET_XY( m_Desc );
-	m_Desc.SetShadowLength( 0 );
-	m_Desc.SetMaxWidth( DESC_WIDTH );
-	m_Desc.SetXY( DESC_X, DESC_Y);
-	m_Desc.PlayCommand( "On" );
 	this->AddChild( &m_Desc );
 
 	m_sprOverPart.Load( THEME->GetPathG(sType,"OverPart") );