From 8f4fdeaa8fb5a231d1bbc249c1190e8a2ebb59df Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 24 Jan 2013 20:34:06 -0800 Subject: [PATCH] Improve CPTextField positioniing in nib2cib --- Tools/nib2cib/NSTextField.j | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index 9c0ce5bac..5f04b8551 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -65,34 +65,13 @@ if ([self isBezeled]) { - [self setFrameOrigin:CGPointMake(frame.origin.x - 6.0, frame.origin.y - 3.0)]; + [self setFrameOrigin:CGPointMake(frame.origin.x - 4.0, frame.origin.y - 3.0)]; [self setFrameSize:CGSizeMake(frame.size.width + 8.0, frame.size.height + 7.0)]; } else { - // // Adjust frame for difference between layout->bounds rect in IB - // [self setFrame:CGRectInset(frame, 3.0, 0.0)]; - - // Hack to get baselines to align - var fontSize = [[self font] size]; - - switch (fontSize) - { - // normal - case 13.0: - [self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y - 1.0)]; - break; - - // small - case 11.0: - [self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y + 2.0)]; - break; - - // mini - case 9.0: - [self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y + 1.0)]; - break; - } + [self setFrameOrigin:CGPointMake(frame.origin.x + 3.0, frame.origin.y)]; + [self setFrameSize:CGSizeMake(frame.size.width - 6.0, frame.size.height)]; } CPLog.debug("NSTextField: title=\"" + [self stringValue] + "\", placeholder=" + ([cell placeholderString] == null ? "" : '"' + [cell placeholderString] + '"') + ", isBordered=" + [self isBordered] + ", isBezeled=" + [self isBezeled] + ", bezelStyle=" + [self bezelStyle]);