block-based shadow drawing

mpw · Jan 20, 2013 · bdd2ad1 · bdd2ad1
1 parent 6f0446e
commit bdd2ad1
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 14 deletions.
diff --git a/DrawingContext/MPWAbstractCGContext.m b/DrawingContext/MPWAbstractCGContext.m
@@ -267,6 +267,30 @@ -(void)drawTextLine:(CTLineRef)l {}
 
 #if NS_BLOCKS_AVAILABLE
 
+-(id)setShadowOffset:(NSSize)offset blur:(float)blur color:aColor
+{
+    return self;
+}
+
+-(id)clearShadow
+{
+    return self;
+}
+
+-withShadowOffset:(NSSize)offset blur:(float)blur color:aColor draw:(DrawingBlock)commands
+{
+    @try {
+        [self setShadowOffset:offset blur:blur color:aColor];
+        [commands drawOnContext:self];
+    }
+    @finally {
+        [self clearShadow];
+    }
+    return self;
+}
+
+
+
 -(id)drawLater:(DrawingBlock)commands
 {
     return [[[MPWDrawingCommands alloc] initWithBlock:commands] autorelease];
@@ -324,8 +348,8 @@ -(void)setAlpha:(float)newAlpha {}
 #endif
 
 @end
-
 #if 0
+
 #import <MPWFoundation/MPWFoundation.h>
 
 @implementation MPWAbstractCGContext(testing)
@@ -358,3 +382,4 @@ +(void)testGetFloats
 
 @end
 #endif
+
diff --git a/DrawingContext/MPWDrawingContext.h b/DrawingContext/MPWDrawingContext.h
@@ -94,6 +94,7 @@
 #if NS_BLOCKS_AVAILABLE
 typedef void (^DrawingBlock)(id <MPWDrawingContext>);
 
+-withShadowOffset:(NSSize)offset blur:(float)blur color:aColor draw:(DrawingBlock)commands;
 -ingsave:(DrawingBlock)drawingCommands;
 -(id)drawLater:(DrawingBlock)drawingCommands;
 -layerWithSize:(NSSize)size content:(DrawingBlock)drawingCommands;

diff --git a/DrawingContext/MPWView.m b/DrawingContext/MPWView.m
@@ -13,7 +13,7 @@
 #else
 #import "MPWView.h"
 #endif
-#import <EGOS_Cocoa/MPWCGDrawingContext.h>
+#import "MPWCGDrawingContext.h"
 
 @implementation MPWView
 

diff --git a/...codeproj/project.xcworkspace/xcuserdata/marcel.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/marcel.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Shared/IconView.m b/Shared/IconView.m
@@ -249,10 +249,9 @@ -(void)drawRect:(NSRect)rect onContext:(id <MPWDrawingContext>)context
     [[context translate:0.5 * (boundsSize.width - scale * nativeSize.width) :0.5 * (boundsSize.height - scale * nativeSize.height)] scale:@(scale)];
 
 	NSRect ellipseRect = NSMakeRect(32, 38, 448, 448);
-    [context setShadowOffset:NSMakeSize(0, -8 * scale) blur:12 * scale  color:[context  colorGray:0 alpha: 0.75]];
-    [context setFillColorGray:0.9 alpha:1.0];
-    [[context ellipseInRect:ellipseRect] fill];
-    [context clearShadow];
+    [context withShadowOffset:NSMakeSize(0, -8 * scale) blur:12 * scale  color:[context  colorGray:0 alpha: 0.75] draw:^(id <MPWDrawingContext> c ){
+        [[[c setFillColorGray:0.9 alpha:1.0] ellipseInRect:ellipseRect] fill];
+    }];
     [[context ellipseInRect:ellipseRect] clip];
 
     [context drawLinearGradientFrom:ellipseRect.origin
@@ -292,15 +291,15 @@ -(void)drawRect:(NSRect)rect onContext:(id <MPWDrawingContext>)context
                              colors:colors
                             offsets:@[ @0.0, @0.85 ]];
 
-    [context setShadowOffset:NSMakeSize(0, 0) blur:12 * scale  color:[context  colorGray:0 alpha: 1.0]];
-     [context ingsave:^(id <MPWDrawingContext> c ){
-        [c translate:@[ @130 ,@140]];
-        [c setFont:[context fontWithName:@"ArialMT" size:345]];
-        [c setFillColorGray:0.9 alpha:1.0];
-        [c setTextPosition:NSMakePoint(0, 0)];
-        [c show:@"\u2766"];
+    [context withShadowOffset:NSMakeSize(0, 0) blur:12 * scale  color:[context  colorGray:0 alpha: 1.0] draw:^(id <MPWDrawingContext> c ){
+            [context ingsave:^(id <MPWDrawingContext> c ){
+                [c translate:@[ @130 ,@140]];
+                [c setFont:[context fontWithName:@"ArialMT" size:345]];
+                [c setFillColorGray:0.9 alpha:1.0];
+                [c setTextPosition:NSMakePoint(0, 0)];
+                [c show:@"\u2766"];
+    }];
     }];
-    [context clearShadow];
 
 	const CGFloat glossInset = 8;
 	CGFloat glossRadius = (ellipseCenterRect.size.width * 0.5) - glossInset;