Merge branch 'build' into 'develop'

removed var to set useMinimumLineHeight, this is now a required setting

See merge request BPHV_MIPS/vds_ios!95
This commit is contained in:
Bruce, Matt R 2023-07-24 16:20:38 +00:00
commit a266af0db2

View File

@ -20,7 +20,6 @@ extension NSAttributedString {
extension NSMutableAttributedString {
public static var useMinimumLineHeight: Bool = true
public static var useScaledLineHeight: Bool = false
public static func mutableText(for text: String, textStyle: TextStyle, useScaledFont: Bool = true, textColor: UIColor, alignment: NSTextAlignment = .left, lineBreakMode: NSLineBreakMode) -> NSMutableAttributedString {
@ -44,9 +43,7 @@ extension NSMutableAttributedString {
//set lineHeight
if textStyle.lineHeight > 0.0 {
if useMinimumLineHeight {
paragraph.minimumLineHeight = lineHeight
}
paragraph.minimumLineHeight = lineHeight
paragraph.maximumLineHeight = lineHeight
}