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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 082a39d5f44b81fba5a41b2431aac6f6fce0c7cc
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 09:29:24 2002 +0000

    	- fixed 2876446 - The label in the authentication panel needs to
    	adjust its height depending on content
    
    	Also improved [NSControl sizeToFitAndAdjustWindowHeight] method.
    
            * Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Adjusted
    	springs.
            * Panels.subproj/WebAuthenticationPanel.m:
    	(-[WebAuthenticationPanel setUpForRequest:]): Use
    	sizeToFitAndAdjustWindowHeight on main label.
    
            * Misc.subproj/WebNSControlExtras.m:
            (-[NSControl sizeToFitAndAdjustWindowHeight]): Improved the logic
    	so the best height is picked while leaving the width
    	alone. Before, the label would always come out to be a very wide
    	single line.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0010eee..47b13a8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2002-10-23  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 2876446 - The label in the authentication panel needs to
+	adjust its height depending on content
+
+	Also improved [NSControl sizeToFitAndAdjustWindowHeight] method.
+	
+        * Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Adjusted
+	springs.
+        * Panels.subproj/WebAuthenticationPanel.m:
+	(-[WebAuthenticationPanel setUpForRequest:]): Use
+	sizeToFitAndAdjustWindowHeight on main label.
+	
+        * Misc.subproj/WebNSControlExtras.m:
+        (-[NSControl sizeToFitAndAdjustWindowHeight]): Improved the logic
+	so the best height is picked while leaving the width
+	alone. Before, the label would always come out to be a very wide
+	single line.
+
 2002-10-22  Maciej Stachowiak  <mjs at apple.com>
 
         * WebKit.pbproj/project.pbxproj: Made WebControllerSets.h
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0010eee..47b13a8 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-10-23  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 2876446 - The label in the authentication panel needs to
+	adjust its height depending on content
+
+	Also improved [NSControl sizeToFitAndAdjustWindowHeight] method.
+	
+        * Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Adjusted
+	springs.
+        * Panels.subproj/WebAuthenticationPanel.m:
+	(-[WebAuthenticationPanel setUpForRequest:]): Use
+	sizeToFitAndAdjustWindowHeight on main label.
+	
+        * Misc.subproj/WebNSControlExtras.m:
+        (-[NSControl sizeToFitAndAdjustWindowHeight]): Improved the logic
+	so the best height is picked while leaving the width
+	alone. Before, the label would always come out to be a very wide
+	single line.
+
 2002-10-22  Maciej Stachowiak  <mjs at apple.com>
 
         * WebKit.pbproj/project.pbxproj: Made WebControllerSets.h
diff --git a/WebKit/Misc.subproj/WebNSControlExtras.m b/WebKit/Misc.subproj/WebNSControlExtras.m
index b2b0769..3320299 100644
--- a/WebKit/Misc.subproj/WebNSControlExtras.m
+++ b/WebKit/Misc.subproj/WebNSControlExtras.m
@@ -13,16 +13,16 @@
 
 - (void)sizeToFitAndAdjustWindowHeight
 {
-    float heightBefore = [self frame].size.height;
-    
-    [self sizeToFit];
-    
     NSRect frame = [self frame];
-    float heightDelta = frame.size.height - heightBefore;
-    
-    frame.origin.y -= heightDelta;
-    [self setFrameOrigin:frame.origin];
+
+    NSSize bestSize = [[self cell] cellSizeForBounds:NSMakeRect(0, 0, frame.size.width, 10000.0)];
     
+    float heightDelta = bestSize.height - frame.size.height;
+
+    frame.size.height += heightDelta;
+    frame.origin.y    -= heightDelta;
+    [self setFrame:frame];
+
     NSRect windowFrame = [[self window] frame];
     windowFrame.size.height += heightDelta;
     [[self window] setFrame:windowFrame display:NO];
diff --git a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
index 7904dfe..cccc60e 100644
--- a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
+++ b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
@@ -3,14 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>194 447 356 240 0 0 1024 746 </string>
+	<string>186 427 356 240 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>283.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
 	<key>IBSystem Version</key>
-	<string>6D52</string>
+	<string>6C115</string>
 </dict>
 </plist>
diff --git a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib
index ff0a18c..3a2ef8d 100644
Binary files a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib and b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib differ
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 0a60612..403dd73 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -10,8 +10,10 @@
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebLocalizableStrings.h>
 
+#import <WebKit/WebNSControlExtras.h>
 #import <WebKit/WebStandardPanelsPrivate.h>
 
+
 #define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
 
 @implementation WebAuthenticationPanel
@@ -95,11 +97,13 @@
     // FIXME Radar 2876448: we should display a different dialog depending on the
     // failure count (if the user tried and failed, the dialog should
     // explain possible reasons)
-    // FIXME Radar 2876446: need to automatically adjust height of main label
     [mainLabel setStringValue:[NSString stringWithFormat:
         UI_STRING("To view this page, you need to log in to area “%@” on %@.",
             "prompt string in authentication panel"),
         [resource realm], [[resource URL] host]]];
+
+    [mainLabel sizeToFitAndAdjustWindowHeight];
+
     if ([resource receivesCredentialSecurely]) {
         [smallLabel setStringValue:
             UI_STRING("Your log-in information will be sent securely.",

-- 
WebKit Debian packaging