actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-20 04:14:53 +00:00
parent 55c440cb4e
commit d11e177327
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/TextBanner.cpp
+13 -22
View File
@@ -94,32 +94,23 @@ void TextBanner::LoadFromString(
CString sDisplaySubTitle, CString sTranslitSubTitle, CString sDisplaySubTitle, CString sTranslitSubTitle,
CString sDisplayArtist, CString sTranslitArtist ) CString sDisplayArtist, CString sTranslitArtist )
{ {
m_textTitle.SetText( sDisplayTitle, sTranslitTitle ); bool bTwoLines = sDisplaySubTitle.size() == 0;
m_textSubTitle.SetText( sDisplaySubTitle, sTranslitSubTitle );
m_textArtist.SetText( sDisplayArtist, sTranslitArtist );
bool bTwoLines = m_textSubTitle.GetText().size() == 0; const float fTitleZoom = bTwoLines ? g_fTwoLinesTitleZoom : g_fThreeLinesTitleZoom;
const float fSubTitleZoom = bTwoLines ? 0 : g_fThreeLinesSubTitleZoom;
const float fArtistZoom = bTwoLines ? g_fTwoLinesArtistZoom : g_fThreeLinesArtistZoom;
float fTitleZoom = bTwoLines ? g_fTwoLinesTitleZoom : g_fThreeLinesTitleZoom; m_textTitle.SetZoom( fTitleZoom );
float fSubTitleZoom = bTwoLines ? 0 : g_fThreeLinesSubTitleZoom; m_textSubTitle.SetZoom( fSubTitleZoom );
float fArtistZoom = bTwoLines ? g_fTwoLinesArtistZoom : g_fThreeLinesArtistZoom; m_textArtist.SetZoom( fArtistZoom );
m_textTitle.SetZoomY( fTitleZoom ); m_textTitle.SetTextMaxWidth( g_fWidth, sDisplayTitle, sTranslitTitle );
m_textSubTitle.SetZoomY( fSubTitleZoom ); m_textSubTitle.SetTextMaxWidth( g_fWidth, sDisplaySubTitle, sTranslitSubTitle );
m_textArtist.SetZoomY( fArtistZoom ); m_textArtist.SetTextMaxWidth( g_fWidth, sDisplayArtist, sTranslitArtist );
/* Avoid division by zero. */ const float fTitleY = bTwoLines ? g_fTwoLinesTitleY : g_fThreeLinesTitleY;
fTitleZoom = min( fTitleZoom, g_fWidth/(m_textTitle.GetWidestLineWidthInSourcePixels()+1) ); const float fSubTitleY = bTwoLines ? 0 : g_fThreeLinesSubTitleY;
fSubTitleZoom = min( fSubTitleZoom, g_fWidth/(m_textSubTitle.GetWidestLineWidthInSourcePixels()+1) ); const float fArtistY = bTwoLines ? g_fTwoLinesArtistY : g_fThreeLinesArtistY;
fArtistZoom = min( fArtistZoom, g_fWidth/(m_textArtist.GetWidestLineWidthInSourcePixels()+1) );
m_textTitle.SetZoomX( fTitleZoom );
m_textSubTitle.SetZoomX( fSubTitleZoom );
m_textArtist.SetZoomX( fArtistZoom );
float fTitleY = bTwoLines ? g_fTwoLinesTitleY : g_fThreeLinesTitleY;
float fSubTitleY = bTwoLines ? 0 : g_fThreeLinesSubTitleY;
float fArtistY = bTwoLines ? g_fTwoLinesArtistY : g_fThreeLinesArtistY;
m_textTitle.SetY( fTitleY ); m_textTitle.SetY( fTitleY );
m_textSubTitle.SetY( fSubTitleY ); m_textSubTitle.SetY( fSubTitleY );