From 25f03a7bd8f8b219ae7cd8f3eb427b917c859be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Wed, 31 May 2006 19:21:16 +0000
Subject: [PATCH] * avoid endless loop in some cases concerning scrolling with
 fractional coords * detect invalid params to SetRange()

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17675 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/ScrollBar.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp
index 1c28bd5fde..75dfc70a1e 100644
--- a/src/kits/interface/ScrollBar.cpp
+++ b/src/kits/interface/ScrollBar.cpp
@@ -299,12 +299,12 @@ BScrollBar::SetValue(float value)
 	if (value < fMin)
 		value = fMin;
 
-	fValue = value;
+	fValue = roundf(value);
 
 	_UpdateThumbFrame();
 	_UpdateArrowButtons();
 
-	ValueChanged(value);
+	ValueChanged(fValue);
 }
 
 // Value
@@ -323,11 +323,11 @@ BScrollBar::ValueChanged(float newValue)
 		BRect targetBounds = fTarget->Bounds();
 		// if vertical, check bounds top and scroll if different from newValue
 		if (fOrientation == B_VERTICAL && targetBounds.top != newValue) {
-			fTarget->ScrollTo(targetBounds.left, newValue);
+			fTarget->ScrollBy(0.0, newValue - targetBounds.top);
 		}
 		// if horizontal, check bounds left and scroll if different from newValue
 		if (fOrientation == B_HORIZONTAL && targetBounds.left != newValue) {
-			fTarget->ScrollTo(newValue, targetBounds.top);
+			fTarget->ScrollBy(newValue - targetBounds.left, 0.0);
 		}
 	}
 
@@ -371,6 +371,14 @@ BScrollBar::Proportion() const
 void
 BScrollBar::SetRange(float min, float max)
 {
+	if (min > max || isnanf(min) || isnanf(max) || isinff(min) || isinff(max)) {
+		min = 0;
+		max = 0;
+	}
+
+	min = roundf(min);
+	max = roundf(max);
+
 	if (fMin == min && fMax == max)
 		return;
 
@@ -378,7 +386,7 @@ BScrollBar::SetRange(float min, float max)
 	fMax = max;
 
 	if (fValue < fMin || fValue > fMax)
-		ValueChanged(fValue);
+		SetValue(fValue);
 	else {
 		_UpdateThumbFrame();
 		Invalidate();
@@ -404,15 +412,15 @@ BScrollBar::SetSteps(float smallStep, float largeStep)
 	
 	// The BeBook also says that we need to specify an integer value even though the step
 	// values are floats. For the moment, we'll just make sure that they are integers
-	fSmallStep = (int32)smallStep;
-	fLargeStep = (int32)largeStep;
+	fSmallStep = roundf(smallStep);
+	fLargeStep = roundf(largeStep);
 
 	// TODO: test use of fractional values and make them work properly if they don't
 }
 
 // GetSteps
 void
-BScrollBar::GetSteps(float *smallStep, float *largeStep) const
+BScrollBar::GetSteps(float* smallStep, float* largeStep) const
 {
 	if (smallStep)
 		*smallStep = fSmallStep;
@@ -543,8 +551,9 @@ BScrollBar::MouseDown(BPoint where)
 			fPrivateData->fExitRepeater = false;
 			fPrivateData->fThumbInc = scrollValue;
 			fPrivateData->fDoRepeat = true;
-			fPrivateData->fRepeaterThread = spawn_thread(fPrivateData->button_repeater_thread,
-														 "scroll repeater", B_NORMAL_PRIORITY, fPrivateData);
+			fPrivateData->fRepeaterThread
+				= spawn_thread(fPrivateData->button_repeater_thread,
+							   "scroll repeater", B_NORMAL_PRIORITY, fPrivateData);
 			resume_thread(fPrivateData->fRepeaterThread);
 		}
 	}