From 02c7c79032e2ee2f4568e49810030f6c35aa80fc Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 18 Nov 2003 01:45:19 +0000
Subject: [PATCH] better MusicWheelItem theming

---
 stepmania/Themes/default/metrics.ini |  8 ++++++--
 stepmania/src/MusicWheelItem.cpp     | 17 +++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index b0bd4594b1..d7c03fbc58 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1703,8 +1703,12 @@ SectionNameX=-30
 SectionZoom=1.0
 RouletteX=-30
 RouletteZoom=1.3
-CourseX=-130
-CourseZoom=1.3
+CourseNameX=-130
+CourseNameY=0
+CourseNameOnCommand=shadowlength,0;zoom,1.3;horizAlign,left
+SortX=-130
+SortY=0
+SortOnCommand=shadowlength,0;zoom,1.3;horizAlign,left
 GradeP1X=82
 GradeP2X=118
 
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 3e6974a8fa..66529e1aea 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -27,6 +27,7 @@
 #include "song.h"
 #include "Course.h"
 #include "ProfileManager.h"
+#include "ActorUtil.h"
 
 
 // WheelItem stuff
@@ -36,8 +37,6 @@
 #define SECTION_ZOOM	THEME->GetMetricF("MusicWheelItem","SectionZoom")
 #define ROULETTE_X		THEME->GetMetricF("MusicWheelItem","RouletteX")
 #define ROULETTE_ZOOM	THEME->GetMetricF("MusicWheelItem","RouletteZoom")
-#define COURSE_X		THEME->GetMetricF("MusicWheelItem","CourseX")
-#define COURSE_ZOOM		THEME->GetMetricF("MusicWheelItem","CourseZoom")
 #define GRADE_X( p )	THEME->GetMetricF("MusicWheelItem",ssprintf("GradeP%dX",p+1))
 
 
@@ -59,6 +58,8 @@ MusicWheelItem::MusicWheelItem()
 {
 	data = NULL;
 
+	SetName( "MusicWheelItem" );
+
 	m_fPercentGray = 0;
 	m_WheelNotifyIcon.SetXY( ICON_X, 0 );
 	
@@ -91,17 +92,13 @@ MusicWheelItem::MusicWheelItem()
 		m_GradeDisplay[p].SetXY( GRADE_X(p), 0 );
 	}
 
+	m_textCourse.SetName( "CourseName" );
 	m_textCourse.LoadFromFont( THEME->GetPathToF("MusicWheelItem course") );
-	m_textCourse.EnableShadow( false );
-	m_textCourse.SetZoom( COURSE_ZOOM );
-	m_textCourse.SetHorizAlign( align_left );
-	m_textCourse.SetXY( COURSE_X, 0 );
+	SET_XY_AND_ON_COMMAND( &m_textCourse );
 
+	m_textSort.SetName( "Sort" );
 	m_textSort.LoadFromFont( THEME->GetPathToF("MusicWheelItem sort") );
-	m_textSort.EnableShadow( false );
-	m_textSort.SetZoom( COURSE_ZOOM );
-	m_textSort.SetHorizAlign( align_left );
-	m_textSort.SetXY( COURSE_X, 0 );
+	SET_XY_AND_ON_COMMAND( &m_textSort );
 }