From f9525ebe268bebc8ce19b75b3870e6615b4b82ea Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 24 Nov 2003 03:02:26 +0000
Subject: [PATCH] remove GetWidestLineWidthInSourcePixels (use
 GetUnzoomedWidth)

---
 stepmania/src/BitmapText.cpp | 13 ++++++-------
 stepmania/src/BitmapText.h   |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index 9598ac4c83..6eae5bee4a 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -73,8 +73,6 @@ BitmapText::BitmapText()
 
 	m_pFont = NULL;
 
-	m_iWidestLineWidth = 0;
-	
 	m_bShadow = true;
 
 	m_bRainbow = false;
@@ -130,16 +128,14 @@ void BitmapText::BuildChars()
 		return;
 
 	/* calculate line lengths and widths */
-	m_iWidestLineWidth = 0;
+	m_size.x = 0;
 
 	m_iLineWidths.clear();
 	for( unsigned l=0; l<m_wTextLines.size(); l++ )	// for each line
 	{
 		m_iLineWidths.push_back(m_pFont->GetLineWidthInSourcePixels( m_wTextLines[l] ));
-		m_iWidestLineWidth = max(m_iWidestLineWidth, m_iLineWidths.back());
+		m_size.x = max( m_size.x, m_iLineWidths.back() );
 	}
-	m_size.x = (float) m_iWidestLineWidth;
-
 
 	verts.clear();
 	tex.clear();
@@ -313,8 +309,11 @@ void BitmapText::SetTextMaxWidth( float MaxWidth, const CString &text, const CSt
 {
 	this->SetText(text, alttext);
 
+	const float Width = GetUnzoomedWidth();
+
 	/* Avoid division by zero. */
-	const int Width = GetWidestLineWidthInSourcePixels()+1;
+	if( !Width )
+		return;
 
 	/* Never decrease the zoom.  Important: make sure you reset zoom before
 	 * changing text with this function. */
diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h
index dd5ada176d..9f753483bb 100644
--- a/stepmania/src/BitmapText.h
+++ b/stepmania/src/BitmapText.h
@@ -30,7 +30,6 @@ public:
 	void SetTextMaxWidth( float MaxWidth, const CString &text, const CString &alttext = "" );
 	void SetWrapWidthPixels( int iWrapWidthPixels );
 
-	int GetWidestLineWidthInSourcePixels() { return m_iWidestLineWidth; };
 	void CropToWidth( int iWidthInSourcePixels );
 
 	virtual void DrawPrimitives();
@@ -56,7 +55,6 @@ protected:
 	CString			m_sText;
 	vector<wstring>	m_wTextLines;
 	vector<int>		m_iLineWidths;			// in source pixels
-	int				m_iWidestLineWidth;		// in source pixels
 	int				m_iWrapWidthPixels;	// -1 = no wrap
 
 	bool m_bRainbow;