Merge pull request #679 from NickyWeber/bugfix/cclabelttf_shadow_overlap_strokessue

vlidholt · vlidholt · commit 06b3598762d5 · 2014-04-04T10:20:53.000-07:00
Bugfix: Shadows overlapping/glow in stroke.
diff --git a/cocos2d/CCLabelTTF.m b/cocos2d/CCLabelTTF.m
@@ -655,17 +655,16 @@ - (CCTexture*) createTextureWithAttributedString:(NSAttributedString*)attributed
         [outlineString addAttribute:NSForegroundColorAttributeName value:color range:NSMakeRange(0, outlineString.length)];
         
         [outlineString drawInRect:drawArea];
-        
-        CGContextSetTextDrawingMode(context, kCGTextFill);
-        
+
         // Don't draw shadow for main font
         CGContextSetShadowWithColor(context, CGSizeZero, 0, NULL);
-        
+
         if (hasShadow)
         {
             // Draw outline again because shadow overlap
             [outlineString drawInRect:drawArea];
         }
+        CGContextSetTextDrawingMode(context, kCGTextFill);
     }
     
     [attributedString drawInRect:drawArea];

Original file line number	Diff line number	Diff line change
`@@ -655,17 +655,16 @@ - (CCTexture) createTextureWithAttributedString:(NSAttributedString)attributed`
`655`	`655`	`[outlineString addAttribute:NSForegroundColorAttributeName value:color range:NSMakeRange(0, outlineString.length)];`
`656`	`656`
`657`	`657`	`[outlineString drawInRect:drawArea];`
`658`		`-`
`659`		`- CGContextSetTextDrawingMode(context, kCGTextFill);`
`660`		`-`
	`658`	`+`
`661`	`659`	`// Don't draw shadow for main font`
`662`	`660`	`CGContextSetShadowWithColor(context, CGSizeZero, 0, NULL);`
`663`		`-`
	`661`	`+`
`664`	`662`	`if (hasShadow)`
`665`	`663`	`{`
`666`	`664`	`// Draw outline again because shadow overlap`
`667`	`665`	`[outlineString drawInRect:drawArea];`
`668`	`666`	`}`
	`667`	`+ CGContextSetTextDrawingMode(context, kCGTextFill);`
`669`	`668`	`}`
`670`	`669`
`671`	`670`	`[attributedString drawInRect:drawArea];`