force size only for bordered buttons and bezeled textfields

This commit is contained in:
Christophe Serafin
2014-08-11 18:08:15 -07:00
parent 93127489e7
commit db6975e07a
3 changed files with 7 additions and 3 deletions
+3 -1
View File
@@ -204,7 +204,9 @@ CPButtonImageOffset = 3.0;
- (void)setControlSize:(CPControlSize)aControlSize
{
[super setControlSize:aControlSize];
[self sizeToControlSize];
if ([self isBordered])
[self sizeToControlSize];
}
+1 -1
View File
@@ -264,7 +264,7 @@ var CPControlBlackColor = [CPColor blackColor];
if (minSize.height > 0)
frameSize.height = minSize.height;
[super setFrameSize:frameSize];
[self setFrameSize:frameSize];
}
+3 -1
View File
@@ -234,7 +234,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
- (void)setControlSize:(CPControlSize)aControlSize
{
[super setControlSize:aControlSize];
[self sizeToControlSize];
if ([self isBezeled])
[self sizeToControlSize];
}
#pragma mark -