From dd28d5e354fb3e5b58b884792fa793ce284f78be Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 30 Aug 2005 07:58:53 +0000
Subject: [PATCH] add BulletOnCommand

---
 stepmania/src/OptionRow.cpp | 5 +++++
 stepmania/src/OptionRow.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 809c0a80a7..555aa56280 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -111,6 +111,7 @@ void OptionRowType::Load( const CString &sType )
 	m_sType = sType;
 
 	BULLET_X   						.Load(sType,"BulletX");
+	BULLET_ON_COMMAND   			.Load(sType,"BulletOnCommand");
 	LABELS_X						.Load(sType,"LabelsX");
 	LABELS_ON_COMMAND				.Load(sType,"LabelsOnCommand");
 	LABEL_GAIN_FOCUS_COMMAND		.Load(sType,"LabelGainFocusCommand");
@@ -393,12 +394,15 @@ void OptionRow::InitText()
 		m_textTitle->RunCommands( m_pParentType->LABELS_ON_COMMAND );
 
 		m_sprBullet->SetX( m_pParentType->BULLET_X );
+		m_sprBullet->RunCommands( m_pParentType->BULLET_ON_COMMAND );
 		break;
 	case OptionRow::ROW_EXIT:
 		m_textTitle->SetHidden( true );
 		m_sprBullet->SetHidden( true );
 		break;
 	}
+
+	this->SortByDrawOrder();
 }
 
 /* After importing options, choose which item is focused. */
@@ -609,6 +613,7 @@ void OptionRow::UpdateEnabledDisabled()
 
 	if( m_sprBullet != NULL )
 		m_sprBullet->SetGlobalDiffuseColor( color );
+	m_sprBullet->PlayCommand( bThisRowHasFocusByAny ? "GainFocus" : "LoseFocus" );
 	m_textTitle->SetGlobalDiffuseColor( color );
 
 
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index e27c820e52..fbc3026ad0 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -100,6 +100,7 @@ private:
 
 	// metrics
 	ThemeMetric<float>				BULLET_X;
+	ThemeMetric<apActorCommands>	BULLET_ON_COMMAND;
 	ThemeMetric<float>				LABELS_X;
 	ThemeMetric<apActorCommands>	LABELS_ON_COMMAND;
 	ThemeMetric<apActorCommands>	LABEL_GAIN_FOCUS_COMMAND;