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

change logic from "extends beyond end" to "width > max width" (preparatory)

Browse Source
This commit is contained in:
Glenn Maynard
2006-03-06 04:22:24 +00:00
parent 28f18b1b39
commit 5dea328ec6
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+8 -10
View File
@@ -312,25 +312,23 @@ void OptionRow::InitText()
BitmapText bt( m_pParentType->m_textItemParent ); BitmapText bt( m_pParentType->m_textItemParent );
bt.RunCommands( m_pParentType->ITEMS_ON_COMMAND ); bt.RunCommands( m_pParentType->ITEMS_ON_COMMAND );
float fX = m_pParentType->ITEMS_START_X; /* Figure out the width of the row. */
float fWidth = m_pParentType->ITEMS_START_X;
for( unsigned c=0; c<m_pHand->m_Def.m_vsChoices.size(); c++ ) for( unsigned c=0; c<m_pHand->m_Def.m_vsChoices.size(); c++ )
{ {
RString sText = m_pHand->m_Def.m_vsChoices[c]; RString sText = m_pHand->m_Def.m_vsChoices[c];
PrepareItemText( sText ); PrepareItemText( sText );
bt.SetText( sText ); bt.SetText( sText );
fX += bt.GetZoomedWidth(); fWidth += bt.GetZoomedWidth();
if( c != m_pHand->m_Def.m_vsChoices.size()-1 ) if( c != m_pHand->m_Def.m_vsChoices.size()-1 )
fX += m_pParentType->ITEMS_GAP_X; fWidth += m_pParentType->ITEMS_GAP_X;
if( fX > m_pParentType->ITEMS_END_X )
{
m_pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
break;
}
} }
float fTotalWidth = m_pParentType->ITEMS_END_X - m_pParentType->ITEMS_START_X;
if( fWidth > fTotalWidth )
m_pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
} }
// //