Merge pull request #85 from wberger/patch-2

malcommac · web-flow · commit 2c8e0db2b744 · 2019-08-24T08:54:45.000+02:00
Use fontDescriptor for instantiating a UIFont from an existing UIFont
diff --git a/Sources/SwiftRichString/Attributes/FontConvertible.swift b/Sources/SwiftRichString/Attributes/FontConvertible.swift
@@ -62,7 +62,7 @@ extension Font: FontConvertible {
 		#elseif os(watchOS)
 		return Font(name: self.fontName, size: (size ?? WATCHOS_SYSTEMFONT_SIZE))!
 		#else
-		return Font(name: self.fontName, size: (size ?? Font.systemFontSize))!
+		return Font(descriptor: self.fontDescriptor, size: (size ?? Font.systemFontSize))
 		#endif
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ extension Font: FontConvertible {`
`62`	`62`	`#elseif os(watchOS)`
`63`	`63`	`return Font(name: self.fontName, size: (size ?? WATCHOS_SYSTEMFONT_SIZE))!`
`64`	`64`	`#else`
`65`		`- return Font(name: self.fontName, size: (size ?? Font.systemFontSize))!`
	`65`	`+ return Font(descriptor: self.fontDescriptor, size: (size ?? Font.systemFontSize))`
`66`	`66`	`#endif`
`67`	`67`	`}`
`68`	`68`