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

Add checkpoints and an assert. Remove mysterious "k_" prefix.

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-10 14:40:17 +00:00
parent 232f7b792a
commit cb4bfafcba
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScrollBar.cpp
+12 -7
View File
@@ -58,29 +58,33 @@ void ScrollBar::SetBarHeight( int iHeight )
void ScrollBar::SetPercentage( float fStartPercent, float fEndPercent ) void ScrollBar::SetPercentage( float fStartPercent, float fEndPercent )
{ {
CHECKPOINT; CHECKPOINT;
const int k_iBarContentHeight = m_iBarHeight - int( m_sprTopButton.GetUnzoomedHeight()/2 + m_sprBottomButton.GetUnzoomedHeight()/2 ); const int iBarContentHeight = m_iBarHeight - int( m_sprTopButton.GetUnzoomedHeight()/2 + m_sprBottomButton.GetUnzoomedHeight()/2 );
ASSERT( iBarContentHeight != 0 );
CHECKPOINT;
// make sure the percent numbers are between 0 and 1 // make sure the percent numbers are between 0 and 1
fStartPercent = fmodf( fStartPercent+1, 1 ); fStartPercent = fmodf( fStartPercent+1, 1 );
fEndPercent = fmodf( fEndPercent+1, 1 ); fEndPercent = fmodf( fEndPercent+1, 1 );
CHECKPOINT;
int iPart1TopY, iPart1BottomY, iPart2TopY, iPart2BottomY; int iPart1TopY, iPart1BottomY, iPart2TopY, iPart2BottomY;
if( fStartPercent < fEndPercent ) // we only need to one 1 thumb part if( fStartPercent < fEndPercent ) // we only need to one 1 thumb part
{ {
iPart1TopY = (int)SCALE( fStartPercent,0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart1TopY = (int)SCALE( fStartPercent,0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
iPart1BottomY = (int)SCALE( fEndPercent, 0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart1BottomY = (int)SCALE( fEndPercent, 0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
iPart2TopY = -1; iPart2TopY = -1;
iPart2BottomY = -1; iPart2BottomY = -1;
} }
else // we need two thumb parts else // we need two thumb parts
{ {
iPart1TopY = (int)SCALE( 0.0f, 0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart1TopY = (int)SCALE( 0.0f, 0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
iPart1BottomY = (int)SCALE( fEndPercent, 0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart1BottomY = (int)SCALE( fEndPercent, 0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
iPart2TopY = (int)SCALE( fStartPercent,0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart2TopY = (int)SCALE( fStartPercent,0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
iPart2BottomY = (int)SCALE( 1.0f, 0.0f, 1.0f, -k_iBarContentHeight/2.0f, +k_iBarContentHeight/2.0f ); iPart2BottomY = (int)SCALE( 1.0f, 0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f );
} }
CHECKPOINT;
m_sprScrollThumbPart1.StretchTo( RectI( m_sprScrollThumbPart1.StretchTo( RectI(
(int)-m_sprScrollThumbPart1.GetUnzoomedWidth()/2, (int)-m_sprScrollThumbPart1.GetUnzoomedWidth()/2,
@@ -89,6 +93,7 @@ void ScrollBar::SetPercentage( float fStartPercent, float fEndPercent )
iPart1BottomY iPart1BottomY
) ); ) );
CHECKPOINT;
if( iPart2TopY != -1 ) if( iPart2TopY != -1 )
{ {
m_sprScrollThumbPart2.StretchTo( RectI( m_sprScrollThumbPart2.StretchTo( RectI(