[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 26c0d819f4ca39ecb89ab4dfba0e2b519233b1e0
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 28 00:51:35 2003 +0000

            - fixed 3441258 -- hysteresis to start dragging a link is too small; too easy to start drag
    
            Reviewed by Chris.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _handleMouseDragged:]):
            Split DragHysteresis into two values, one for links and one for images. Make
            the link one much larger than the image one (since dragging an image doesn't
            occur accidentally in the ways that dragging a link does).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 462a077..22b2111 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-27  John Sullivan  <sullivan at apple.com>
+
+        - fixed 3441258 -- hysteresis to start dragging a link is too small; too easy to start drag
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _handleMouseDragged:]):
+        Split DragHysteresis into two values, one for links and one for images. Make
+        the link one much larger than the image one (since dragging an image doesn't
+        occur accidentally in the ways that dragging a link does).
+
 2003-10-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3462523>: Safari Sometimes Destroys Applets When Going "Back"
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f8bc70c..3b4c09e 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -42,9 +42,11 @@
 #import <Foundation/NSURL_NSURLExtras.h>
 #import <Foundation/NSURLRequestPrivate.h>
 
-// These are a little larger than typical because dragging links is a fairly
-// advanced feature that can confuse non-power-users
-#define DragHysteresis  		10.0
+// The link drag hysteresis is much larger than the others because there
+// needs to be enough space to cancel the link press without starting a link drag,
+// and because dragging links is rare.
+#define LinkDragHysteresis              40.0
+#define ImageDragHysteresis  		5.0
 #define TextDragHysteresis  		3.0
 #define TextDragDelay			0.15
 
@@ -627,7 +629,8 @@ static WebHTMLView *lastHitView = nil;
     float deltaY = ABS(mouseDraggedPoint.y - mouseDownPoint.y);
     
     // Drag hysteresis hasn't been met yet but we don't want to do other drag actions like selection.
-    if (((imageURL || linkURL) && deltaX < DragHysteresis && deltaY < DragHysteresis) ||
+    if ((imageURL && deltaX < ImageDragHysteresis && deltaY < ImageDragHysteresis) ||
+        (linkURL && deltaX < LinkDragHysteresis && deltaY < LinkDragHysteresis) ||
         (isSelectedText && deltaX < TextDragHysteresis && deltaY < TextDragHysteresis)) {
 	return;
     }

-- 
WebKit Debian packaging