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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 7db19ad16e45bd8fc1cb5013c5d8df9a224b3aa3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 13 06:48:20 2002 +0000

            Don't initiate a drag if an autoscroll happened.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView mouseDragged:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b480dc3..2c79b9b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-12  Richard Williamson (Home)  <rjw at apple.com>
+
+        Don't initiate a drag if an autoscroll happened.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-12  Richard Williamson (Local)  <rjw at apple.com>
 
         Added absolute position column to render node for 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b480dc3..2c79b9b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-12  Richard Williamson (Home)  <rjw at apple.com>
+
+        Don't initiate a drag if an autoscroll happened.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-12  Richard Williamson (Local)  <rjw at apple.com>
 
         Added absolute position column to render node for 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index ca3038e..e46f08c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -423,13 +423,18 @@
 - (void)mouseDragged:(NSEvent *)event
 {
     // Ensure that we're visible wrt the event location.
-    [self autoscroll:event];
+    BOOL didScroll = [self autoscroll:event];
+    
+    if (didScroll){
+        _private->mouseDownPoint.x = -FLT_MAX;
+        _private->mouseDownPoint.y = -FLT_MAX;
+    }
     
     // Now do WebKit dragging.
     float deltaX = ABS([event locationInWindow].x - _private->mouseDownPoint.x);
     float deltaY = ABS([event locationInWindow].y - _private->mouseDownPoint.y);
 
-    if (deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis){
+    if ((deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis) && !didScroll){
         NSPoint point = [self convertPoint:_private->mouseDownPoint fromView:nil];
         NSDictionary *element = [self _elementAtPoint: point];
         NSURL *linkURL = [element objectForKey: WebContextMenuElementLinkURLKey];

-- 
WebKit Debian packaging