From d5b1390afbd55b1518fd44dc30cfa8621cba4373 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 16 Jun 2003 17:34:20 +0000
Subject: [PATCH] fix strange tween-in remove old metric defines

---
 stepmania/src/ScreenOptions.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index c3beea57aa..76ea054d0a 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -7,6 +7,7 @@
 
  Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
 	Chris Danford
+	Glenn Maynard
 -----------------------------------------------------------------------------
 */
 
@@ -35,8 +36,6 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 };
 #define EXPLANATION_X		THEME->GetMetricF("ScreenOptions","ExplanationX")
 #define EXPLANATION_Y		THEME->GetMetricF("ScreenOptions","ExplanationY")
 #define EXPLANATION_ZOOM	THEME->GetMetricF("ScreenOptions","ExplanationZoom")
-#define HELP_TEXT			THEME->GetMetric("ScreenOptions","HelpText")
-#define TIMER_SECONDS		THEME->GetMetricI("ScreenOptions","TimerSeconds")
 #define COLOR_SELECTED		THEME->GetMetricC("ScreenOptions","ColorSelected")
 #define COLOR_NOT_SELECTED	THEME->GetMetricC("ScreenOptions","ColorNotSelected")
 
@@ -148,6 +147,23 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRow[], int iNumOptionLin
 	PositionCursors();
 	UpdateEnabledDisabled();
 	OnChange();
+
+	/* It's tweening into position, but on the initial tween-in we only want to
+	 * tween in the whole page at once.  Since the tweens are nontrivial, it's
+	 * easiest to queue the tweens and then force them to finish. */
+	for( i=0; i<m_iNumOptionRows; i++ )	// foreach options line
+	{
+		m_textTitles[i].FinishTweening();
+		m_sprBullets[i].FinishTweening();
+		for( unsigned j=0; j<m_OptionRow[i].choices.size(); j++ )
+			m_textItems[i][j].FinishTweening();
+
+		for( int p=0; p<NUM_PLAYERS; p++ )	// foreach player
+		{
+			m_Underline[p][i].FinishTweening();
+			m_OptionIcons[p][i].FinishTweening();
+		}
+	}
 }
 
 ScreenOptions::~ScreenOptions()