From 3e46438fd0be5c32707fadee2d201b9a68c59a68 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 2 Dec 2019 10:11:04 -0500 Subject: [PATCH] label font bugfix caused by the dissonance between label and styler setting.... --- MVMCoreUI/Atoms/Views/Label.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift index b2cc4f56..99a28463 100644 --- a/MVMCoreUI/Atoms/Views/Label.swift +++ b/MVMCoreUI/Atoms/Views/Label.swift @@ -243,8 +243,12 @@ public typealias ActionBlock = () -> () if let fontStyle = json?.optionalStringForKey("fontStyle") { MFStyler.styleLabel(label, withStyle: fontStyle, genericScaling: mvmLabel == nil) + mvmLabel?.standardFontSize = label.font.pointSize } else { let fontSize = json?["fontSize"] as? CGFloat + if let fontSize = fontSize { + mvmLabel?.standardFontSize = fontSize + } if let fontName = json?.optionalStringForKey("fontName") { label.font = MFFonts.mfFont(withName: fontName, size: fontSize ?? mvmLabel?.standardFontSize ?? label.font.pointSize)