From c4aadc69e3d70f568eaca4b015d8838316433245 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 14 Aug 2004 20:18:34 +0000 Subject: [PATCH] fix ScrollBar flickering: -1 is used as a sentinel value, but is a valid coordinate simplify --- stepmania/src/ScrollBar.cpp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/stepmania/src/ScrollBar.cpp b/stepmania/src/ScrollBar.cpp index 7021a411ea..2c4fdb67aa 100644 --- a/stepmania/src/ScrollBar.cpp +++ b/stepmania/src/ScrollBar.cpp @@ -61,8 +61,8 @@ void ScrollBar::SetPercentage( float fStartPercent, float fEndPercent ) { iPart1TopY = (int)SCALE( fStartPercent,0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f ); iPart1BottomY = (int)SCALE( fEndPercent, 0.0f, 1.0f, -iBarContentHeight/2.0f, +iBarContentHeight/2.0f ); - iPart2TopY = -1; - iPart2BottomY = -1; + iPart2TopY = 0; + iPart2BottomY = 0; } else // we need two thumb parts { @@ -82,19 +82,12 @@ void ScrollBar::SetPercentage( float fStartPercent, float fEndPercent ) ) ); CHECKPOINT; - if( iPart2TopY != -1 ) - { - m_sprScrollThumbPart2.StretchTo( RectI( - (int)-m_sprScrollThumbPart2.GetUnzoomedWidth()/2, - iPart2TopY, - (int)+m_sprScrollThumbPart2.GetUnzoomedWidth()/2, - iPart2BottomY - ) ); - } - else - { - m_sprScrollThumbPart2.SetZoomY( 0 ); - } + m_sprScrollThumbPart2.StretchTo( RectI( + (int)-m_sprScrollThumbPart2.GetUnzoomedWidth()/2, + iPart2TopY, + (int)+m_sprScrollThumbPart2.GetUnzoomedWidth()/2, + iPart2BottomY + ) ); CHECKPOINT; }