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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-24 02:41:52 +00:00
parent ab88907742
commit 01d7bab936
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GroupList.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ void GroupList::Load( const CStringArray& asGroupNames )
void GroupList::ResetTextSize( int i ) void GroupList::ResetTextSize( int i )
{ {
BitmapText *label = m_textLabels[i]; BitmapText *label = m_textLabels[i];
const float fTextWidth = (float)label->GetWidestLineWidthInSourcePixels(); const float fTextWidth = (float)label->GetUnzoomedWidth();
const float fButtonWidth = m_sprButtons[i]->GetZoomedWidth(); const float fButtonWidth = m_sprButtons[i]->GetZoomedWidth();
float fZoom = fButtonWidth/fTextWidth; float fZoom = fButtonWidth/fTextWidth;
stepmania/src/MusicWheelItem.cpp
+2 -2
View File
@@ -159,8 +159,8 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID )
bt->SetDiffuse( data->m_color ); bt->SetDiffuse( data->m_color );
bt->TurnRainbowOff(); bt->TurnRainbowOff();
float fSourcePixelWidth = (float)bt->GetWidestLineWidthInSourcePixels(); const float fSourcePixelWidth = (float)bt->GetUnzoomedWidth();
float fMaxTextWidth = 200; const float fMaxTextWidth = 200;
if( fSourcePixelWidth > fMaxTextWidth ) if( fSourcePixelWidth > fMaxTextWidth )
bt->SetZoomX( fMaxTextWidth / fSourcePixelWidth ); bt->SetZoomX( fMaxTextWidth / fSourcePixelWidth );
} }
stepmania/src/ScreenMiniMenu.cpp
+2 -2
View File
@@ -91,8 +91,8 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
fLongestLabelPlusAnswer = max( fLongestLabelPlusAnswer = max(
fLongestLabelPlusAnswer, fLongestLabelPlusAnswer,
m_textLabel[i].GetWidestLineWidthInSourcePixels() * ZOOM_SELECTED + m_textLabel[i].GetUnzoomedWidth() * ZOOM_SELECTED +
m_textAnswer[i].GetWidestLineWidthInSourcePixels() * ZOOM_SELECTED ); m_textAnswer[i].GetUnzoomedWidth() * ZOOM_SELECTED );
if( !bMarkedFirstEnabledLine && line.enabled ) if( !bMarkedFirstEnabledLine && line.enabled )
{ {
stepmania/src/ScreenPrompt.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ ScreenPrompt::ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool b
} }
m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetUnzoomedWidth()+10.0f );
m_rectAnswerBox.SetZoomY( 30 ); m_rectAnswerBox.SetZoomY( 30 );
m_textAnswer[m_bAnswer].SetEffectGlowShift(); m_textAnswer[m_bAnswer].SetEffectGlowShift();
@@ -153,7 +153,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn )
m_rectAnswerBox.StopTweening(); m_rectAnswerBox.StopTweening();
m_rectAnswerBox.BeginTweening( 0.2f ); m_rectAnswerBox.BeginTweening( 0.2f );
m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); m_rectAnswerBox.SetZoomX( m_textAnswer[m_bAnswer].GetUnzoomedWidth()+10.0f );
SOUND->PlayOnce( THEME->GetPathToS("ScreenPrompt change") ); SOUND->PlayOnce( THEME->GetPathToS("ScreenPrompt change") );
} }