From 0a9c319a10d9a74c50b95f1f5dae326ef0195e1b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 31 Aug 2002 06:43:28 +0000
Subject: [PATCH] Fix scrollbar tweening.  (Previously, the scrollbar wouldn't
 reappear after changing sorts; it'd keep moving right.)

---
 stepmania/src/MusicWheel.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index d64d260ac8..5869c9e461 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -1177,12 +1177,10 @@ void MusicWheel::TweenOnScreen()
 	m_sprSelectionOverlay.SetTweenX( fX );
 
 
-	fX = m_ScrollBar.GetX();
-	fY = m_ScrollBar.GetY();
-	m_ScrollBar.SetXY( fX+30, fY );
+	m_ScrollBar.SetX( SCROLL_BAR_X+30 );
 	m_ScrollBar.BeginTweeningQueued( 0.7f );	// sleep
 	m_ScrollBar.BeginTweeningQueued( 0.2f, Actor::TWEEN_BIAS_BEGIN );
-	m_ScrollBar.SetTweenX( fX );	
+	m_ScrollBar.SetTweenX( SCROLL_BAR_X );	
 
 
 	for( int i=0; i<NUM_WHEEL_ITEMS_TO_DRAW; i++ )
@@ -1216,7 +1214,7 @@ void MusicWheel::TweenOffScreen()
 
 	m_ScrollBar.BeginTweeningQueued( 0 );
 	m_ScrollBar.BeginTweeningQueued( 0.2f, Actor::TWEEN_BIAS_BEGIN );
-	m_ScrollBar.SetTweenX( m_ScrollBar.GetX()+30 );	
+	m_ScrollBar.SetTweenX( SCROLL_BAR_X+30 );	
 
 
 	for( int i=0; i<NUM_WHEEL_ITEMS_TO_DRAW; i++ )