Fix for 4077106, wheel scroll amount smaller in Tiger. All along wheeling should...

	line height of 10 (just as arrow keys did).  Scroll arrows should have done this too for scroll views (they did
	already for overflow sections).  This patch puts the override into the scrollview itself, and removes the
	multipliers in the private frame methods.

        Reviewed by darin

        * WebView.subproj/WebFrameView.m:
        (-[WebFrameView _verticalKeyboardScrollDistance]):
        (-[WebFrameView initWithFrame:]):
        (-[WebFrameView _horizontalKeyboardScrollDistance]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ceaa9f229517ebc351db49838b484bd8fa0ba491..cf2e42f574f0bd089ae12e698b75f80192406439 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-05  David Hyatt  <hyatt@apple.com>
+
+       Fix for 4077106, wheel scroll amount smaller in Tiger.  All along wheeling should have been 4x the default
+       line height of 10 (just as arrow keys did).  Scroll arrows should have done this too for scroll views (they did
+       already for overflow sections).  This patch puts the override into the scrollview itself, and removes the
+       multipliers in the private frame methods.
+       
+        Reviewed by darin
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView _verticalKeyboardScrollDistance]):
+        (-[WebFrameView initWithFrame:]):
+        (-[WebFrameView _horizontalKeyboardScrollDistance]):
+
 === WebKit-312.1 ===
 
 2005-03-31  Chris Blumenberg  <cblu@apple.com>

diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 78cc0a61a1b4c93c40d85ca4d67702b0863c32cb..67e141c378d5c1a670b7acf4459dd692e53fa6bc 100644 (file)
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -96,10 +96,8 @@ enum {
 
 - (float)_verticalKeyboardScrollDistance
 {
-    // verticalLineScroll is quite small, to make scrolling from the scroll bar
-    // arrows relatively smooth. But this seemed too small for scrolling with
-    // the arrow keys, so we bump up the number here. Cheating? Perhaps.
-    return [[self _scrollView] verticalLineScroll] * 4;
+    // Arrow keys scroll the same distance that clicking the scroll arrow does.
+    return [[self _scrollView] verticalLineScroll];
 }
 
 - (BOOL)_shouldDrawBorder
@@ -309,6 +307,7 @@ static NSMutableDictionary *viewTypes;
     [scrollView setHasVerticalScroller: NO];
     [scrollView setHasHorizontalScroller: NO];
     [scrollView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+    [scrollView setLineScroll:40.0];
     [self addSubview: scrollView];
     // don't call our overridden version here; we need to make the standard NSView link between us
     // and our subview so that previousKeyView and previousValidKeyView work as expected. This works
@@ -529,10 +528,8 @@ static NSMutableDictionary *viewTypes;
 
 - (float)_horizontalKeyboardScrollDistance
 {
-    // horizontalLineScroll is quite small, to make scrolling from the scroll bar
-    // arrows relatively smooth. But this seemed too small for scrolling with
-    // the arrow keys, so we bump up the number here. Cheating? Perhaps.
-    return [[self _scrollView] horizontalLineScroll] * 4;
+    // Arrow keys scroll the same distance that clicking the scroll arrow does.
+    return [[self _scrollView] horizontalLineScroll];
 }
 
 - (float)_horizontalPageScrollDistance