[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 132b28bd388c33c034f1d0c8c2d7188ace179d5d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 13 20:06:02 2002 +0000

            Changed drag hysteresis to 5 and disallow selection initiation within
            a link.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView mouseDragged:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2058 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bd0426a..00f1499 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
+        Changed drag hysteresis to 5 and disallow selection initiation within
+        a link.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-12  Darin Adler  <darin at apple.com>
 
 	Prep work for fixes to the text encoding for subframes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bd0426a..00f1499 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
+        Changed drag hysteresis to 5 and disallow selection initiation within
+        a link.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-12  Darin Adler  <darin at apple.com>
 
 	Prep work for fixes to the text encoding for subframes.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 944e56e..6df0807 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -412,8 +412,8 @@
     [[self _bridge] mouseDown:event];
 }
 
-#define DragStartXHysteresis  		2.0
-#define DragStartYHysteresis  		1.0
+#define DragStartXHysteresis  		5.0
+#define DragStartYHysteresis  		5.0
 
 #define DRAG_LABEL_BORDER_X		4.0
 #define DRAG_LABEL_BORDER_Y		2.0
@@ -434,12 +434,12 @@
     float deltaX = ABS([event locationInWindow].x - _private->mouseDownPoint.x);
     float deltaY = ABS([event locationInWindow].y - _private->mouseDownPoint.y);
 
+    NSPoint point = [self convertPoint:_private->mouseDownPoint fromView:nil];
+    NSDictionary *element = [self _elementAtPoint: point];
+    NSURL *linkURL = [element objectForKey: WebContextMenuElementLinkURLKey];
+    NSURL *imageURL = [element objectForKey: WebContextMenuElementImageURLKey];
+    
     if ((deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis) && !didScroll){
-        NSPoint point = [self convertPoint:_private->mouseDownPoint fromView:nil];
-        NSDictionary *element = [self _elementAtPoint: point];
-        NSURL *linkURL = [element objectForKey: WebContextMenuElementLinkURLKey];
-        NSURL *imageURL = [element objectForKey: WebContextMenuElementImageURLKey];
-
         if(imageURL || linkURL){
             [_private->draggedURL release];
             
@@ -521,9 +521,10 @@
         }
     }
 
-    // Give khtml a crack at the event only if we haven't started
-    // a drag.
-    [[self _bridge] mouseDragged:event];
+    // Give khtml a crack at the event only if we haven't started,
+    // or potentially starated, a drag
+    if (!linkURL && !imageURL)
+        [[self _bridge] mouseDragged:event];
 }
 
 

-- 
WebKit Debian packaging