From db6975e07a290c95a7b0703152ce4bfe72e242ff Mon Sep 17 00:00:00 2001
From: Christophe Serafin <christophe.serafin@gmail.com>
Date: Mon, 11 Aug 2014 18:08:15 -0700
Subject: [PATCH] force size only for bordered buttons and bezeled textfields

---
 AppKit/CPButton.j    | 4 +++-
 AppKit/CPControl.j   | 2 +-
 AppKit/CPTextField.j | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 7209b5234..c6a622841 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -204,7 +204,9 @@ CPButtonImageOffset   = 3.0;
 - (void)setControlSize:(CPControlSize)aControlSize
 {
     [super setControlSize:aControlSize];
-    [self sizeToControlSize];
+
+    if ([self isBordered])
+        [self sizeToControlSize];
 }
 
 
diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index f703180bd..477a8b284 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -264,7 +264,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if (minSize.height > 0)
         frameSize.height = minSize.height;
 
-    [super setFrameSize:frameSize];
+    [self setFrameSize:frameSize];
 }
 
 
diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index f0fc477e4..6069d71a0 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -234,7 +234,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)setControlSize:(CPControlSize)aControlSize
 {
     [super setControlSize:aControlSize];
-    [self sizeToControlSize];
+
+    if ([self isBezeled])
+        [self sizeToControlSize];
 }
 
 #pragma mark -