mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/label_molecule_fonting' into 'develop'

Browse Source 
label font bugfix caused by the dissonance between label and styler setting....

See merge request BPHV_MIPS/mvm_core_ui!192
This commit is contained in:
Pfeil, Scott Robert 2019-12-02 10:16:42 -05:00
commit 44fd2dffac
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atoms/Views/Label.swift
View File

@ -243,8 +243,12 @@ public typealias ActionBlock = () -> ()
if let fontStyle = json?.optionalStringForKey("fontStyle") { if let fontStyle = json?.optionalStringForKey("fontStyle") {
MFStyler.styleLabel(label, withStyle: fontStyle, genericScaling: mvmLabel == nil) MFStyler.styleLabel(label, withStyle: fontStyle, genericScaling: mvmLabel == nil)
mvmLabel?.standardFontSize = label.font.pointSize
} else { } else {
let fontSize = json?["fontSize"] as? CGFloat let fontSize = json?["fontSize"] as? CGFloat
if let fontSize = fontSize {
mvmLabel?.standardFontSize = fontSize
}
if let fontName = json?.optionalStringForKey("fontName") { if let fontName = json?.optionalStringForKey("fontName") {
label.font = MFFonts.mfFont(withName: fontName, size: fontSize ?? mvmLabel?.standardFontSize ?? label.font.pointSize) label.font = MFFonts.mfFont(withName: fontName, size: fontSize ?? mvmLabel?.standardFontSize ?? label.font.pointSize)