Fix #337: SVGParser: Apply font weight to custom fonts

exyte · Apr 27, 2018 · 7342228 · 7342228
1 parent e58629b
commit 7342228
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Source/model/scene/Text.swift b/Source/model/scene/Text.swift
@@ -67,7 +67,7 @@ open class Text: Node {
         let font: MFont
         if let f = self.font {
 
-            if let customFont = RenderUtils.loadFont(name: f.name, size: f.size) {
+            if let customFont = RenderUtils.loadFont(name: f.name, size: f.size, weight: f.weight) {
                 font = customFont
             } else {
                 font = MFont.systemFont(ofSize: CGFloat(f.size), weight: getWeight(f.weight))

diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
@@ -90,7 +90,7 @@ class RenderUtils {
         fatalError("Unsupported node: \(node)")
     }
 
-    class func loadFont(name: String, size: Int) -> MFont? {
+    class func loadFont(name: String, size: Int, weight: String?) -> MFont? {
         let separationSet = CharacterSet(charactersIn: ",")
         let names = name.components(separatedBy: separationSet)
         var customFont: MFont? = .none
@@ -99,14 +99,12 @@ class RenderUtils {
                 return
             }
 
-            if fontName.first == " " {
-                let index = fontName.index(fontName.startIndex, offsetBy: 1)
-                let fixedName = String(fontName.suffix(from: index))
-                customFont = MFont(name: fixedName, size: CGFloat(size))
-                return
+            let fontName = fontName.trimmingCharacters(in: .whitespaces)
+            var fontDec = UIFontDescriptor(name: fontName, size: CGFloat(size))
+            if weight == "bold" || weight == "bolder" {
+                fontDec = fontDec.withSymbolicTraits(.traitBold)!
             }
-
-            customFont = MFont(name: fontName, size: CGFloat(size))
+            customFont = MFont(descriptor: fontDec, size: CGFloat(size))
         }
 
         return customFont

diff --git a/Source/render/TextRenderer.swift b/Source/render/TextRenderer.swift
@@ -81,7 +81,7 @@ class TextRenderer: NodeRenderer {
         }
 
         if let textFont = text.font {
-            if let customFont = RenderUtils.loadFont(name: textFont.name, size: textFont.size) {
+            if let customFont = RenderUtils.loadFont(name: textFont.name, size: textFont.size, weight: textFont.weight) {
                 return customFont
             } else {
                 if let weight = getWeight(textFont.weight) {