kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-02-13 09:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ReactNative] <Text>: apply the fontWeight correctly if fontFamily style is also present

Browse Source
This commit is contained in:
Kevin Gozali
2015-04-08 19:17:26 -07:00
parent ae76d3982b
commit e5aeb31d6f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
React/Base/RCTConvert.m
View File

@@ -670,11 +670,6 @@ static BOOL RCTFontIsCondensed(UIFont *font)
isCondensed = RCTFontIsCondensed(font);
}
// Get font weight
if (weight) {
fontWeight = [self RCTFontWeight:weight];
}
// Get font style
if (style) {
isItalic = [self RCTFontStyle:style];
@@ -700,6 +695,11 @@ static BOOL RCTFontIsCondensed(UIFont *font)
}
}
// Get font weight
if (weight) {
fontWeight = [self RCTFontWeight:weight];
}
// Get closest match
UIFont *bestMatch = font;
CGFloat closestWeight = font ? RCTWeightOfFont(font) : INFINITY;