Merge remote-tracking branch 'msand/NestedSvg' into merge-test

# Conflicts:
#	ios/Elements/RNSVGGroup.m
#	ios/RNSVGNode.h
#	ios/RNSVGNode.m
This commit is contained in:
Mikael Sand
2018-03-18 23:41:58 +02:00
29 changed files with 449 additions and 270 deletions
+4 -4
View File
@@ -18,14 +18,14 @@
RNSVGGlyphContext *_glyphContext;
}
- (void)renderLayerTo:(CGContextRef)context
- (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
{
[self clip:context];
CGContextSaveGState(context);
[self setupGlyphContext:context];
CGPathRef path = [self getGroupPath:context];
[self renderGroupTo:context];
[self renderGroupTo:context rect:rect];
[self releaseCachedPath];
CGContextRestoreGState(context);
@@ -68,10 +68,10 @@
return (CGPathRef)CFAutorelease(CGPathCreateCopyByTransformingPath(groupPath, &CGAffineTransformIdentity));
}
- (void)renderGroupTo:(CGContextRef)context
- (void)renderGroupTo:(CGContextRef)context rect:(CGRect)rect
{
[self pushGlyphContext];
[super renderGroupTo:context];
[super renderGroupTo:context rect:rect];
[self popGlyphContext];
}