zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-05-31 13:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove getAlignmentBaseline and getBaselineShift methods, use property methods instead.

Browse Source
This commit is contained in:
Nikolay Demyankov
2018-03-14 17:00:38 +01:00
parent ef8b687ff0
commit f7c81ef368
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Text/RNSVGTSpan.m
+2 -2
View File
@@ -509,8 +509,8 @@ static double RNSVGTSpan_radToDeg = 180 / M_PI;
double top = ascenderHeight;
double totalHeight = top + bottom;
double baselineShift = 0;
NSString *baselineShiftString = [self getBaselineShift];
enum RNSVGAlignmentBaseline baseline = RNSVGAlignmentBaselineFromString([self getAlignmentBaseline]);
NSString *baselineShiftString = self.baselineShift;
enum RNSVGAlignmentBaseline baseline = RNSVGAlignmentBaselineFromString(self.alignmentBaseline);
if (baseline != RNSVGAlignmentBaselineBaseline) {
// TODO alignment-baseline, test / verify behavior
// TODO get per glyph baselines from font baseline table, for high-precision alignment
ios/Text/RNSVGText.h
-2
View File
@@ -24,7 +24,5 @@
- (void)releaseCachedPath;
- (CGPathRef)getGroupPath:(CGContextRef)context;
- (CTFontRef)getFontFromContext;
- (NSString*) getAlignmentBaseline;
- (NSString*) getBaselineShift;
@end
ios/Text/RNSVGText.m
+28 -26
View File
@@ -90,52 +90,54 @@
return root;
}
- (NSString*) getAlignmentBaseline
- (NSString *)alignmentBaseline
{
if (self.alignmentBaseline != nil) {
return self.alignmentBaseline;
if (_alignmentBaseline != nil) {
return _alignmentBaseline;
}
UIView* parent = [self superview];
UIView* parent = self.superview;
while (parent != nil) {
if ([parent isKindOfClass:[RNSVGText class]]) {
RNSVGText* node = (RNSVGText*)parent;
NSString* baseline = node.alignmentBaseline;
if (baseline != nil) {
self.alignmentBaseline = baseline;
_alignmentBaseline = baseline;
return baseline;
}
}
parent = [parent superview];
}
if (self.alignmentBaseline == nil) {
self.alignmentBaseline = RNSVGAlignmentBaselineStrings[0];
if (_alignmentBaseline == nil) {
_alignmentBaseline = RNSVGAlignmentBaselineStrings[0];
}
return self.alignmentBaseline;
return _alignmentBaseline;
}
- (NSString*) getBaselineShift
- (NSString *)baselineShift
{
if (self.baselineShift != nil) {
return self.baselineShift;
if (_baselineShift != nil) {
return _baselineShift;
}
if (self.baselineShift == nil) {
UIView* parent = [self superview];
while (parent != nil) {
if ([parent isKindOfClass:[RNSVGText class]]) {
RNSVGText* node = (RNSVGText*)parent;
NSString* baselineShift = node.baselineShift;
if (baselineShift != nil) {
self.baselineShift = baselineShift;
return baselineShift;
}
UIView* parent = [self superview];
while (parent != nil) {
if ([parent isKindOfClass:[RNSVGText class]]) {
RNSVGText* node = (RNSVGText*)parent;
NSString* baselineShift = node.baselineShift;
if (baselineShift != nil) {
_baselineShift = baselineShift;
return baselineShift;
}
parent = [parent superview];
}
parent = [parent superview];
}
if (self.baselineShift == nil) {
self.baselineShift = @"";
}
return self.baselineShift;
// set default value
_baselineShift = @"";
return _baselineShift;
}
- (RNSVGGlyphContext *)getGlyphContext