add size to fit for buttons. Closes cappuccino#34.

280north · May 6, 2009 · ae8fd0c · ae8fd0c
1 parent 81d23aa
commit ae8fd0c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
@@ -125,8 +125,8 @@ var _CPButtonClassName                          = nil,
 
 + (id)themedAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil]
-                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil, 24.0]
+                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color", @"default-height"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -374,6 +374,18 @@ var _CPButtonClassName                          = nil,
     return bounds;
 }
 
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
+{
+    var size = [([self title] || " ") sizeWithFont:[self font]],
+        contentInset = [self currentValueForThemedAttributeName:@"content-inset"],
+        defaultHeight = [self currentValueForThemedAttributeName:@"default-height"];
+
+    [self setFrameSize:CGSizeMake(size.width + contentInset.left + contentInset.right, defaultHeight)];
+}
+
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
     if (aName === "bezel-view")

diff --git a/AppKit/CoreGraphics/CGGeometry.j b/AppKit/CoreGraphics/CGGeometry.j
@@ -208,3 +208,9 @@ function CGPointFromEvent(anEvent)
 {
     return _CGPointMake(anEvent.clientX, anEvent.clientY);
 }
+
+function CPStringFromInset(anInset)
+{
+    return anInset.top+" "+anInset.left+" "+anInset.bottom+" "+anInset.right;
+}
+