From ace66b2b2ff5d982bb6d0e05c005a1e11d5fed72 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Tue, 16 Nov 2010 09:41:11 -0500 Subject: [PATCH] Sizing code had been added to CPTextField initWithCoder that required resizing in NSTextField NS_initWithCoder to be removed. However, the sizing code was removed, so this code has to be re-inserted. --- Tools/nib2cib/NSTextField.j | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index 98933bd36..1d9ca5561 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -58,14 +58,19 @@ var textColor = [cell textColor], defaultColor = [self currentValueForThemeAttribute:@"text-color"]; - // Don't change the text color if it is not the default, that messes up the theme lookups later + // Don't change the text color if it is not the default, that messes up the theme lookups later if (![textColor isEqual:defaultColor]) [self setTextColor:[cell textColor]]; - var frame = [self frame]; + // Only adjust the origin and size if this is a bezeled textfield. + // This ensures that labels positioned in IB are properly positioned after nibcib. + if ([self isBezeled]) + { + var frame = [self frame]; - [self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y)]; - [self setFrameSize:CGSizeMake(frame.size.width, frame.size.height)]; + [self setFrameOrigin:CGPointMake(frame.origin.x - 4.0, frame.origin.y - 4.0)]; + [self setFrameSize:CGSizeMake(frame.size.width + 8.0, frame.size.height + 8.0)]; + } CPLog.debug([self stringValue] + " => isBordered=" + [self isBordered] + ", isBezeled=" + [self isBezeled] + ", bezelStyle=" + [self bezelStyle] + "("+[cell stringValue]+", " + [cell placeholderString] + ")"); }