[Author: thomasvl]

Don't trim the whitespace off the string when doing test sizing...
TextField does some odd stuff with whitespace when it does wrap things, if you don't include the white space, then when you use the real string (to wrap), it moves the last word down a line because of lack of space for the whitespace (go figure).
Oh, and fix the leak.

R=dmaclach
DELTA=6  (0 added, 1 deleted, 5 changed)

4 files changed, 2 insertions, 3 deletions

diff --git a/AppKit/GTMUILocalizerAndLayoutTweaker.m b/AppKit/GTMUILocalizerAndLayoutTweaker.m
index 771df9d..698fb91 100644
--- a/AppKit/GTMUILocalizerAndLayoutTweaker.m
+++ b/AppKit/GTMUILocalizerAndLayoutTweaker.m
@@ -290,8 +290,7 @@ static BOOL IsRightAnchored(NSView *view);
     _GTMDevAssert(tokenizer, @"failed to get a tokenizer");
     return 0.0;
   }
-  NSCell *workerCell = [cell copy];
-  NSCharacterSet *whiteSpaceSet = [NSCharacterSet whitespaceCharacterSet];
+  NSCell *workerCell = [[cell copy] autorelease];
 
   // Loop trying line break points until the height fits.
   while (1) {
@@ -308,7 +307,7 @@ static BOOL IsRightAnchored(NSView *view);
     NSRange subStringRange =
       NSMakeRange(0, tokenRange.location + tokenRange.length);
     NSString *subString = [str substringWithRange:subStringRange];
-    subString = [subString stringByTrimmingCharactersInSet:whiteSpaceSet];
+    //subString = [subString stringByTrimmingCharactersInSet:whiteSpaceSet];
 
     // Find how wide the cell would be for this sub string.
     [workerCell setStringValue:subString];
diff --git a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-Min-3.tiff b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-Min-3.tiff
index 018b225..ed584fe 100644
--- a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-Min-3.tiff
+++ b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-Min-3.tiff
diff --git a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-1.tiff b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-1.tiff
index 5875e42..b12cad0 100644
--- a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-1.tiff
+++ b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-1.tiff
diff --git a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-3.tiff b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-3.tiff
index 61cefe0..972271b 100644
--- a/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-3.tiff
+++ b/AppKit/TestData/GTMUILocalizerAndLayoutTweakerTest7-NoMin-3.tiff