From 50e85f57f2788e1baaf3afbf4950b1618279941d Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Fri, 16 Feb 2001 01:34:21 +0000
Subject: [PATCH] fixed vertical scrolling bug

---
 WINGs/wscrollview.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/WINGs/wscrollview.c b/WINGs/wscrollview.c
index c2d42541..c74f576d 100644
--- a/WINGs/wscrollview.c
+++ b/WINGs/wscrollview.c
@@ -113,7 +113,7 @@ applyScrollerValues(WMScrollView *sPtr)
 
 	int size;
 
-	size = sPtr->contentView->size.width-sPtr->viewport->size.width;
+	size = sPtr->contentView->size.height-sPtr->viewport->size.height;
 	
 	y = v * size;
     } else {
@@ -551,14 +551,13 @@ static void
 updateScrollerProportion(ScrollView *sPtr)
 {
     float prop, value;
-    
-    if (sPtr->flags.hasHScroller) {
-	float oldV, oldP;
-	
+    float oldV, oldP;
+
+    if (sPtr->flags.hasHScroller) {	
 	oldV = WMGetScrollerValue(sPtr->hScroller);
 	oldP = WMGetScrollerKnobProportion(sPtr->hScroller);
 	
-	prop = (float)sPtr->viewport->size.width/sPtr->contentView->size.width;
+	prop = (float)sPtr->viewport->size.width/(float)sPtr->contentView->size.width;
 
 	if (oldP == 1.0) 
 	    value = 0;
@@ -567,10 +566,15 @@ updateScrollerProportion(ScrollView *sPtr)
 	WMSetScrollerParameters(sPtr->hScroller, value, prop);
     }
     if (sPtr->flags.hasVScroller) {
-	prop = (float)sPtr->viewport->size.height/sPtr->contentView->size.height;
-	
-	value = WMGetScrollerValue(sPtr->vScroller);
+	oldV = WMGetScrollerValue(sPtr->vScroller);
+	oldP = WMGetScrollerKnobProportion(sPtr->vScroller);
 	
+	prop = (float)sPtr->viewport->size.height/(float)sPtr->contentView->size.height;
+
+	if (oldP == 1.0) 
+	    value = 0;
+	else
+	    value = (prop * oldV) / oldP;
 	WMSetScrollerParameters(sPtr->vScroller, value, prop);
     }
     applyScrollerValues(sPtr);
-- 
2.11.4.GIT