zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-05-12 15:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Fix clipped bounds calculation for gradients

Browse Source 
Fixes https://github.com/react-native-community/react-native-svg/issues/738
This commit is contained in:
Mikael Sand
2018-09-01 13:49:13 +03:00
parent a1097b8594
commit 11a57526fc
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/Brushes/RNSVGBrush.h
View File

@@ -35,6 +35,6 @@
* be clipped.
* @abstract
*/
- (void)paint:(CGContextRef)context opacity:(CGFloat)opacity painter:(RNSVGPainter *)painter;
- (void)paint:(CGContextRef)context opacity:(CGFloat)opacity painter:(RNSVGPainter *)painter bounds:(CGRect)bounds;
@end

2
ios/Brushes/RNSVGPainter.h
View File

@@ -14,7 +14,7 @@
- (instancetype)initWithPointsArray:(NSArray<NSString *> *)pointsArray NS_DESIGNATED_INITIALIZER;
- (void)paint:(CGContextRef)context;
- (void)paint:(CGContextRef)context bounds:(CGRect)bounds;
- (void)setUnits:(RNSVGUnits)unit;

18
ios/Brushes/RNSVGPainter.m
View File

@@ -66,20 +66,20 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
_colors = colors;
}
- (void)paint:(CGContextRef)context
- (void)paint:(CGContextRef)context bounds:(CGRect)bounds
{
if (_type == kRNSVGLinearGradient) {
[self paintLinearGradient:context];
[self paintLinearGradient:context bounds:(CGRect)bounds];
} else if (_type == kRNSVGRadialGradient) {
[self paintRidialGradient:context];
[self paintRidialGradient:context bounds:(CGRect)bounds];
} else if (_type == kRNSVGPattern) {
// todo:
}
}
- (CGRect)getPaintRect:(CGContextRef)context
- (CGRect)getPaintRect:(CGContextRef)context bounds:(CGRect)bounds
{
CGRect rect = _useObjectBoundingBox ? CGContextGetClipBoundingBox(context) : _userSpaceBoundingBox;
CGRect rect = _useObjectBoundingBox ? bounds : _userSpaceBoundingBox;
float height = CGRectGetHeight(rect);
float width = CGRectGetWidth(rect);
float x = 0.0;
@@ -93,13 +93,13 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
return CGRectMake(x, y, width, height);
}
- (void)paintLinearGradient:(CGContextRef)context
- (void)paintLinearGradient:(CGContextRef)context bounds:(CGRect)bounds
{
CGGradientRef gradient = CGGradientRetain([RCTConvert RNSVGCGGradient:_colors offset:0]);
CGGradientDrawingOptions extendOptions = kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation;
CGRect rect = [self getPaintRect:context];
CGRect rect = [self getPaintRect:context bounds:bounds];
float height = CGRectGetHeight(rect);
float width = CGRectGetWidth(rect);
float offsetX = CGRectGetMinX(rect);
@@ -124,12 +124,12 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
CGGradientRelease(gradient);
}
- (void)paintRidialGradient:(CGContextRef)context
- (void)paintRidialGradient:(CGContextRef)context bounds:(CGRect)bounds
{
CGGradientRef gradient = CGGradientRetain([RCTConvert RNSVGCGGradient:_colors offset:0]);
CGGradientDrawingOptions extendOptions = kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation;
CGRect rect = [self getPaintRect:context];
CGRect rect = [self getPaintRect:context bounds:bounds];
float height = CGRectGetHeight(rect);
float width = CGRectGetWidth(rect);
float offsetX = CGRectGetMinX(rect);

10
ios/Brushes/RNSVGPainterBrush.m
View File

@@ -21,22 +21,22 @@
self.class, NSStringFromSelector(_cmd), array);
return nil;
}
self.brushRef = [array objectAtIndex:1];
}
return self;
}
- (void)paint:(CGContextRef)context opacity:(CGFloat)opacity painter:(RNSVGPainter *)painter
- (void)paint:(CGContextRef)context opacity:(CGFloat)opacity painter:(RNSVGPainter *)painter bounds:(CGRect)bounds
{
BOOL transparency = opacity < 1;
if (transparency) {
CGContextSetAlpha(context, opacity);
CGContextBeginTransparencyLayer(context, NULL);
}
[painter paint:context];
[painter paint:context bounds:(CGRect)bounds];
if (transparency) {
CGContextEndTransparencyLayer(context);
}

2
ios/RNSVGRenderable.m
View File

@@ -211,6 +211,7 @@
[self.fill paint:context
opacity:self.fillOpacity
painter:[self.svgView getDefinedPainter:self.fill.brushRef]
bounds:pathBounding
];
CGContextRestoreGState(context);
@@ -256,6 +257,7 @@
[self.stroke paint:context
opacity:self.strokeOpacity
painter:[self.svgView getDefinedPainter:self.stroke.brushRef]
bounds:pathBounding
];
return;
}