fixed disabled bug, fixed memory leak

mattlawer · Apr 2, 2013 · 839de55 · 839de55
1 parent 20a592d
commit 839de55
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/BButton/BButton.m b/BButton/BButton.m
@@ -32,6 +32,8 @@ - (void)setGradientEnabled:(BOOL)enabled;
 @implementation BButton
 
 @synthesize color;
+@synthesize gradient;
+@synthesize shouldShowDisabled;
 
 #pragma mark - Initialization
 - (void)setup
@@ -162,6 +164,24 @@ - (void)setColor:(UIColor *)newColor
     [self setNeedsDisplay];
 }
 
+- (void)setShouldShowDisabled:(BOOL)show
+{
+    shouldShowDisabled = show;
+
+    if(show) {
+        if([self.color isLightColor])
+            [self setTitleColor:[UIColor colorWithWhite:0.4f alpha:0.5f] forState:UIControlStateDisabled];
+        else
+            [self setTitleColor:[UIColor colorWithWhite:1.0f alpha:0.5f] forState:UIControlStateDisabled];
+    }
+    else {
+        if([self.color isLightColor])
+            [self setTitleColor:[UIColor blackColor] forState:UIControlStateDisabled];
+        else
+            [self setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled];
+    }
+}
+
 #pragma mark - BButton
 - (void)setType:(BButtonType)type
 {
@@ -294,16 +314,12 @@ - (void)drawRect:(CGRect)rect
 - (void)setGradientEnabled:(BOOL)enabled
 {
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    UIColor *topColor = [self.color lightenColorWithValue:0.12f];
-
-    if(!enabled) {
-        topColor = [self.color darkenColorWithValue:0.12f];
-    }
+    UIColor *topColor = enabled ? [self.color lightenColorWithValue:0.12f] : [self.color darkenColorWithValue:0.12f];
 
     NSArray *newGradientColors = [NSArray arrayWithObjects:(id)topColor.CGColor, (id)self.color.CGColor, nil];
     CGFloat newGradientLocations[] = {0.0f, 1.0f};
 
-    self.gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)newGradientColors, newGradientLocations);
+    gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)newGradientColors, newGradientLocations);
     CGColorSpaceRelease(colorSpace);
 }