zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-05 07:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix image rendering

Browse Source
This commit is contained in:
Mikael Sand
2018-01-03 03:38:37 +02:00
parent 83d00d09db
commit 310fbed841
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Elements/RNSVGImage.m
+23 -32
View File
@@ -96,55 +96,46 @@
- (void)renderLayerTo:(CGContextRef)context - (void)renderLayerTo:(CGContextRef)context
{ {
CGRect rect = [self getRect:context];
// add hit area
CGPathRef hitArea = CGPathCreateWithRect(rect, nil);
[self setHitArea:hitArea];
CGPathRelease(hitArea);
CGContextSaveGState(context); CGContextSaveGState(context);
CGContextTranslateCTM(context, 0, rect.size.height + 2 * rect.origin.y);
CGContextScaleCTM(context, 1, -1); // add hit area
CGRect hitArea = [self getHitArea];
CGPathRef hitAreaPath = CGPathCreateWithRect(hitArea, nil);
[self setHitArea:hitAreaPath];
CGPathRelease(hitAreaPath);
// apply viewBox transform on Image render. // apply viewBox transform on Image render.
CGRect renderRect = CGRectMake(0, 0, _imageSize.width, _imageSize.height); CGRect imageBounds = CGRectMake(0, 0, _imageSize.width, _imageSize.height);
CGAffineTransform viewbox = [RNSVGViewBox getTransform:imageBounds eRect:hitArea align:self.align meetOrSlice:self.meetOrSlice];
CGFloat rectWidth = CGRectGetWidth(rect);
CGFloat rectHeight = CGRectGetHeight(rect); CGContextTranslateCTM(context, 0, hitArea.size.height);
CGFloat rectX = CGRectGetMinX(rect); CGContextScaleCTM(context, 1, -1);
CGFloat rectY = CGRectGetMinY(rect);
CGFloat canvasLeft = [self getContextLeft];
CGFloat canvasTop = [self getContextTop];
CGRect eRect = CGRectMake(canvasLeft, canvasTop, rectWidth, rectHeight);
CGRect vbRect = CGRectMake(0, 0, CGRectGetWidth(renderRect), CGRectGetHeight(renderRect));
CGAffineTransform transform = [RNSVGViewBox getTransform:vbRect eRect:eRect align:self.align meetOrSlice:self.meetOrSlice];
renderRect = CGRectApplyAffineTransform(renderRect, transform);
CGFloat dx = rectX + canvasLeft;
CGFloat dy = rectY + canvasTop;
renderRect = CGRectApplyAffineTransform(renderRect, CGAffineTransformMakeTranslation(dx, dy));
[self clip:context]; [self clip:context];
CGContextClipToRect(context, rect); CGContextClipToRect(context, hitArea);
CGContextConcatCTM(context, viewbox);
CGContextDrawImage(context, renderRect, _image); CGContextDrawImage(context, imageBounds, _image);
CGContextRestoreGState(context); CGContextRestoreGState(context);
} }
- (CGRect)getRect:(CGContextRef)context - (CGRect)getHitArea
{ {
CGFloat x = [self relativeOnWidth:self.x]; CGFloat x = [self relativeOnWidth:self.x];
CGFloat y = [self relativeOnHeight:self.y]; CGFloat y = [self relativeOnHeight:self.y];
CGFloat width = [self relativeOnWidth:self.width]; CGFloat width = [self relativeOnWidth:self.width];
CGFloat height = [self relativeOnHeight:self.height]; CGFloat height = [self relativeOnHeight:self.height];
if (width == 0) {
width = _imageSize.width;
}
if (height == 0) {
height = _imageSize.height;
}
return CGRectMake(x, y, width, height); return CGRectMake(x, y, width, height);
} }
- (CGPathRef)getPath:(CGContextRef)context - (CGPathRef)getPath:(CGContextRef)context
{ {
return (CGPathRef)CFAutorelease(CGPathCreateWithRect([self getRect:context], nil)); return (CGPathRef)CFAutorelease(CGPathCreateWithRect([self getHitArea], nil));
} }
@end @end