[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 8a93d02e1272cea597b47f945b03bc610f9895b2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 15 00:51:28 2004 +0000

    	Updated fix for 3576315.  Don't hardcode 22 as the titlebar
    	height.  (Note, other places in CarbonWindowFrame DO hardcode
    	window geometry information, yuck!).
    
            Reviewed by Hyatt.
    
            * Carbon.subproj/CarbonWindowFrame.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowFrame.m b/WebKit/Carbon.subproj/CarbonWindowFrame.m
index 426a607..13c03c5 100644
--- a/WebKit/Carbon.subproj/CarbonWindowFrame.m
+++ b/WebKit/Carbon.subproj/CarbonWindowFrame.m
@@ -48,9 +48,15 @@ The class of objects that are meant to be used as _borderViews of NSCarbonWindow
 
     boundsRect = [self bounds];
 
+    CarbonWindowAdapter *carbonWindow;
+    carbonWindow = (CarbonWindowAdapter *)[self window];
+    WindowRef windowRef = [carbonWindow windowRef];
+    Rect globalBounds;
+    GetWindowBounds (windowRef, kWindowTitleBarRgn, &globalBounds);
+    
     titlebarRect.origin.x    = boundsRect.origin.x;
     titlebarRect.size.width  = boundsRect.size.width;
-    titlebarRect.size.height = 22;
+    titlebarRect.size.height = globalBounds.bottom - globalBounds.top;
     titlebarRect.origin.y    = NSMaxY(boundsRect) - titlebarRect.size.height;
 
     return titlebarRect;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e785c6c..1363713 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-14  Richard Williamson   <rjw at apple.com>
+
+	Updated fix for 3576315.  Don't hardcode 22 as the titlebar
+	height.  (Note, other places in CarbonWindowFrame DO hardcode
+	window geometry information, yuck!).
+
+        Reviewed by Hyatt.
+
+        * Carbon.subproj/CarbonWindowFrame.m:
+
 2004-04-14  John Sullivan  <sullivan at apple.com>
 
         - changed stealth mode preference name from "historyIsFrozen"

-- 
WebKit Debian packaging