From f6d09557affae1d99faaa1a990d2b7bf1d76b6a7 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Wed, 11 Aug 2010 18:37:39 -0400 Subject: [PATCH] Revert this change, it breaks text labels >12pt --- Tools/nib2cib/NSTextField.j | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index 746879170..cafceba12 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -64,16 +64,8 @@ var frame = [self frame]; - [self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y)]; - [self setFrameSize:CGSizeMake(frame.size.width, frame.size.height)]; - - // Only adjust the origin and size if this is a bezeled textfield - // this makes sure that labels positioned in IB are properly positioned after nibcib - if ([self isBezeled]) - { - [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)]; - } + [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] + ")"); }