From cb02171492443c0d591130d8ee831ad26dc6a175 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 1 Mar 2005 21:55:23 +0000 Subject: [PATCH] set text before running commands so commands can use text width --- stepmania/src/TextBanner.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp index c6938bb079..764e019c25 100644 --- a/stepmania/src/TextBanner.cpp +++ b/stepmania/src/TextBanner.cpp @@ -55,24 +55,24 @@ void TextBanner::LoadFromString( { Init(); + m_textTitle.SetText( sDisplayTitle, sTranslitTitle ); + m_textSubTitle.SetText( sDisplaySubTitle, sTranslitSubTitle ); + m_textArtist.SetText( sDisplayArtist, sTranslitArtist ); + bool bTwoLines = sDisplaySubTitle.size() == 0; if( bTwoLines ) { - m_textTitle.RunCommands( TWO_LINES_TITLE_COMMAND ); - m_textSubTitle.RunCommands( TWO_LINES_SUBTITLE_COMMAND ); - m_textArtist.RunCommands( TWO_LINES_ARTIST_COMMAND ); + m_textTitle.RunCommands2( TWO_LINES_TITLE_COMMAND, this ); + m_textSubTitle.RunCommands2( TWO_LINES_SUBTITLE_COMMAND, this ); + m_textArtist.RunCommands2( TWO_LINES_ARTIST_COMMAND, this ); } else { - m_textTitle.RunCommands( THREE_LINES_TITLE_COMMAND ); - m_textSubTitle.RunCommands( THREE_LINES_SUBTITLE_COMMAND ); - m_textArtist.RunCommands( THREE_LINES_ARTIST_COMMAND ); + m_textTitle.RunCommands2( THREE_LINES_TITLE_COMMAND, this ); + m_textSubTitle.RunCommands2( THREE_LINES_SUBTITLE_COMMAND, this ); + m_textArtist.RunCommands2( THREE_LINES_ARTIST_COMMAND, this ); } - - m_textTitle.SetText( sDisplayTitle, sTranslitTitle ); - m_textSubTitle.SetText( sDisplaySubTitle, sTranslitSubTitle ); - m_textArtist.SetText( sDisplayArtist, sTranslitArtist ); } void TextBanner::LoadFromSong( const Song* pSong )