Minor changes to fix some issues

stevestreza · Jan 24, 2010 · 37b63f0 · 37b63f0
1 parent f502bef
commit 37b63f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Source/NSColor+CGColor.h b/Source/NSColor+CGColor.h
@@ -17,7 +17,7 @@
 
 #import "VSGlobal.h"
 
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
 @interface UIColor (CGColorRef)
 #elif TARGET_OS_MAC

diff --git a/Source/NSColorAdditions.m b/Source/NSColorAdditions.m
@@ -133,7 +133,7 @@ - (VSColor*)copyWithAlpha:(CGFloat)newAlpha {
 	CGFloat g = rgba[1];
 	CGFloat b = rgba[2];
 
-	return VSColorRGBA(r,g,b,newAlpha);
+	return [VSColorRGBA(r,g,b,newAlpha) copy];
 }
 
 - (VSColor*)addHue:(CGFloat)hd saturation:(CGFloat)sd value:(CGFloat)vd {

diff --git a/Source/NSView+VSStyle.m b/Source/NSView+VSStyle.m
@@ -33,9 +33,9 @@ -(void)drawStyle:(VSStyle *)style inRect:(CGRect)rect{
 		context.contentFrame = context.frame;
 
 		[style draw:context];
-		if (!context.didDrawContent) {
-//			[self drawContent:[context contentFrame]];
-		}
+//		if (!context.didDrawContent && [self respondsToSelector:@selector(drawLayer:withStyle:)]) {
+//			[self drawLayer:context withStyle:style];
+//		}
 	}
 }
 

diff --git a/Source/VSImageStyle.m b/Source/VSImageStyle.m
@@ -101,7 +101,10 @@ - (void)dealloc {
 // VSStyle
 
 - (void)draw:(VSStyleContext*)context {
-	VSImage* image = [self imageForContext:context];
+	VSImage* image = _image;
+	if(!image){
+		image = [self imageForContext:context];
+	}
 	if (image) {
 		[image drawInRect:context.contentFrame contentMode:_contentMode];
 	}

diff --git a/Source/VSInnerShadowStyle.m b/Source/VSInnerShadowStyle.m
@@ -31,7 +31,7 @@ - (void)draw:(VSStyleContext*)context {
 	CGContextClip(ctx);
 
 	[context.shape addInverseToPath:context.frame];
-	[[VSColor whiteColor] setFill];
+//	[[VSColor whiteColor] setFill];
 	CGContextSetShadowWithColor(ctx, CGSizeMake(_offset.width, -_offset.height), _blur,
 								_color.CGColor);
 	CGContextEOFillPath(ctx);