[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 7468c0dd69ab2520ab118edf828303cf9205f81f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 25 19:54:57 2003 +0000

    	Use 11 point bold, instead of 12 point bold, to draw dragged link
    	labels.  This matches the text drawn in the bookmarks bar.
    
            Reviewed by John.
    
            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[WebHTMLView _dragImageForLinkElement:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3c925d0..ca3c3f3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-25  Richard Williamson   <rjw at apple.com>
+
+	Use 11 point bold, instead of 12 point bold to draw dragged link
+	labels.  This matches the text drawn in the bookmarks bar.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _dragImageForLinkElement:]):
+
 2003-07-24  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3279910.  Change the way we draw dragged link to use
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 765c690..6472ea6 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -50,6 +50,9 @@
 #define MIN_DRAG_LABEL_WIDTH_BEFORE_CLIP	120.0
 #define MAX_DRAG_LABEL_WIDTH                    320.0
 
+#define DRAG_LINK_LABEL_FONT_SIZE   11.0
+#define DRAG_LINK_URL_FONT_SIZE   10.0
+
 #import <CoreGraphics/CGStyle.h>
 #import <CoreGraphics/CGSTypes.h>
 #import <CoreGraphics/CGContextGState.h>
@@ -441,9 +444,9 @@ static WebHTMLView *lastHitView = nil;
 	label = urlString;
     }
     
-    NSFont *labelFont = [[NSFontManager sharedFontManager] convertFont:[NSFont systemFontOfSize:12.0]
+    NSFont *labelFont = [[NSFontManager sharedFontManager] convertFont:[NSFont systemFontOfSize:DRAG_LINK_LABEL_FONT_SIZE]
                                                    toHaveTrait:NSBoldFontMask];
-    NSFont *urlFont = [NSFont systemFontOfSize: 10.0];
+    NSFont *urlFont = [NSFont systemFontOfSize: DRAG_LINK_URL_FONT_SIZE];
     NSSize labelSize;
     labelSize.width = [label _web_widthWithFont: labelFont];
     labelSize.height = [labelFont ascender] - [labelFont descender];

-- 
WebKit Debian packaging