Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridge CTFontRef directly to UIFont when converting attributes on NSAttributedString #1579

Merged
merged 4 commits into from
Jul 11, 2019
Merged

Bridge CTFontRef directly to UIFont when converting attributes on NSAttributedString #1579

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e2295b
Fallback to system font if the fontFamily is incorrect
rahul-malik Jul 10, 2019
ca5a167
Update fallback logic to respect the bold / italic specifications in …
rahul-malik Jul 10, 2019
a721603
Fix indentation
rahul-malik Jul 10, 2019
dab0b27
CTFontRef toll free bridges to UIFont on iOS.
rahul-malik Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/TextKit/ASTextKitCoreTextAdditions.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName)
CGFloat fontSize = CTFontGetSize(coreTextFont);
UIFont *font = [UIFont fontWithName:fontName size:fontSize];
ASDisplayNodeCAssertNotNil(font, @"unable to load font %@ with size %f", fontName, fontSize);
if (font == nil) {
if (font == nil || ![font.familyName isEqualToString:fontName]) {
// Gracefully fail if we were unable to load the font.
// Additionally UIFont is returning a different font family than expected, fallback to the system font
font = [UIFont systemFontOfSize:fontSize];
}
cleanAttributes[NSFontAttributeName] = font;
Expand Down