Merge branch 'feature/rollingback_label' into 'develop'

undo label

See merge request BPHV_MIPS/mvm_core_ui!685
This commit is contained in:
Pfeil, Scott Robert 2021-03-11 09:22:44 -05:00
commit 4ce76cbf08

View File

@ -624,9 +624,6 @@ public typealias ActionBlock = () -> ()
} else if !MVMCoreGetterUtility.fequal(a: Float(standardFontSize), b: 0.0), let sizeObject = sizeObject ?? MFStyler.sizeObjectGeneric(forCurrentDevice: standardFontSize) {
font = font.updateSize(sizeObject.getValueBased(onSize: size))
}
// Provide the label additional size information to help calculate its intrinsic content.
preferredMaxLayoutWidth = Styler.maxAvailableLayoutWidth(size: size)
}
@objc public func setFont(_ font: UIFont, scale: Bool) {