From 172ecb845566aada5d89938ad7240495ae6c8d1f Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 1 Jun 2011 12:15:13 -0400
Subject: [PATCH] Trying different ordering here.

---
 Themes/_fallback/metrics.ini |  2 +-
 src/NoteField.cpp            | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 190aed0285..46246439b0 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1016,7 +1016,7 @@ TickcountOffsetX=70
 ComboOffsetX=50
 LabelOffsetX=130
 SpeedOffsetX=30
-ScrollOffsetX=40
+ScrollOffsetX=100
 FakeOffsetX=90
 
 [PlayerStageStats]
diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index c51a96d31c..4fa86c1003 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -637,7 +637,7 @@ void NoteField::DrawScrollText( const float fBeat, float fPercent )
 	m_textMeasureNumber.SetHorizAlign( SCROLL_IS_LEFT_SIDE ? align_right : align_left );
 	m_textMeasureNumber.SetDiffuse( SCROLL_COLOR );
 	m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
-	m_textMeasureNumber.SetText( ssprintf("%.3fx", fPercent) );
+	m_textMeasureNumber.SetText( ssprintf("%.3f", fPercent) );
 	m_textMeasureNumber.SetXY( (SCROLL_IS_LEFT_SIDE ? -xBase - xOffset : xBase + xOffset), fYPos );
 	m_textMeasureNumber.Draw();
 }
@@ -896,6 +896,20 @@ void NoteField::DrawPrimitives()
 
 		const TimingData &timing = *pTiming;
 		
+		// Scroll text
+		if( GAMESTATE->m_bIsUsingStepTiming )
+		{
+			FOREACH_CONST( ScrollSegment, timing.m_ScrollSegments, seg )
+			{
+				if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
+				{
+					float fBeat = seg->GetBeat();
+					if( IS_ON_SCREEN(fBeat) )
+						DrawScrollText( fBeat, seg->GetRatio() );
+				}
+			}
+		}
+		
 		// BPM text
 		FOREACH_CONST( BPMSegment, timing.m_BPMSegments, seg )
 		{
@@ -994,20 +1008,6 @@ void NoteField::DrawPrimitives()
 			}
 		}
 		
-		// Scroll text
-		if( GAMESTATE->m_bIsUsingStepTiming )
-		{
-			FOREACH_CONST( ScrollSegment, timing.m_ScrollSegments, seg )
-			{
-				if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
-				{
-					float fBeat = seg->GetBeat();
-					if( IS_ON_SCREEN(fBeat) )
-						DrawScrollText( fBeat, seg->GetRatio() );
-				}
-			}
-		}
-		
 		// Speed text
 		if( GAMESTATE->m_bIsUsingStepTiming )
 		{