diff --git a/PFColorAlert.mm b/PFColorAlert.mm index dc76828..d22fa47 100755 --- a/PFColorAlert.mm +++ b/PFColorAlert.mm @@ -190,7 +190,7 @@ - (PFColorAlert *)initWithStartColor:(UIColor *)startColor showAlpha:(BOOL)showA [self.saturationSlider updateGraphicsWithColor:startColor]; [self.brightnessSlider updateGraphicsWithColor:startColor]; [self.alphaSlider updateGraphicsWithColor:startColor]; - // [self.litePreviewView setMainColor:[UIColor colorWithHue:startColor.hue saturation:startColor.saturation brightness:startColor.brightness alpha:startColor.alpha] previousColor:startColor]; + [self.litePreviewView setMainColor:[UIColor colorWithHue:startColor.hue saturation:startColor.saturation brightness:startColor.brightness alpha:startColor.alpha] previousColor:startColor]; [self setPrimaryColor:startColor]; diff --git a/PFColorLitePreviewView.h b/PFColorLitePreviewView.h index f51f252..610557a 100755 --- a/PFColorLitePreviewView.h +++ b/PFColorLitePreviewView.h @@ -5,4 +5,5 @@ @property (nonatomic, retain) UIColor *previousColor; - (void)updateWithColor:(UIColor *)color; - (id)initWithFrame:(CGRect)frame mainColor:(UIColor *)mc previousColor:(UIColor *)prev; +- (void)setMainColor:(UIColor *)mc previousColor:(UIColor *)prev; @end diff --git a/PFColorLitePreviewView.m b/PFColorLitePreviewView.m index f47a9bb..32e804d 100755 --- a/PFColorLitePreviewView.m +++ b/PFColorLitePreviewView.m @@ -15,6 +15,12 @@ - (void)updateWithColor:(UIColor *)color [self setNeedsDisplay]; } +- (void)setMainColor:(UIColor *)mc previousColor:(UIColor *)prev +{ + self.mainColor = mc; + if (prev) self.previousColor = prev; +} + - (id)initWithFrame:(CGRect)frame mainColor:(UIColor *)mc previousColor:(UIColor *)prev { self = [super initWithFrame:frame]; @@ -22,10 +28,10 @@ - (id)initWithFrame:(CGRect)frame mainColor:(UIColor *)mc previousColor:(UIColor if (self) { self.mainColor = mc; - + if (prev) self.previousColor = prev; [self setBackgroundColor:[UIColor clearColor]]; - + [self setNeedsDisplay]; } @@ -36,7 +42,7 @@ - (void)drawRect:(CGRect)rect { if (!self.mainColor) self.mainColor = [UIColor whiteColor]; - + CGContextRef context = UIGraphicsGetCurrentContext(); // CGContextSetLineWidth(context, 4.0); @@ -107,7 +113,7 @@ - (void)drawRect:(CGRect)rect CGContextSetFillColorWithColor(context, self.previousColor.CGColor); CGContextDrawPath(context, kCGPathEOFill); } - else + else { CGContextAddArc(context, rect.size.width / 2, rect.size.height / 2, rect.size.width / 3, 0, 2 * M_PI, 1); CGContextSetFillColorWithColor(context, self.mainColor.CGColor);