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

Merge branch 'bugfix/label_textattachment_check' into 'develop'

Browse Source 
error check for label attachment

See merge request BPHV_MIPS/mvm_core_ui!632
This commit is contained in:
Pfeil, Scott Robert 2020-11-11 16:46:15 -05:00
commit 82948957fd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
View File

@ -351,9 +351,13 @@ public typealias ActionBlock = () -> ()
} else { } else {
imageAttachment = Label.getTextAttachmentImage(name: imageName, dimension: fontSize) imageAttachment = Label.getTextAttachmentImage(name: imageName, dimension: fontSize)
} }
let mutableString = NSMutableAttributedString()
mutableString.append(NSAttributedString(attachment: imageAttachment)) // Confirm that the intended image location is within range.
attributedString.insert(mutableString, at: imageAtt.location) if 0...labelText.count ~= imageAtt.location {
let mutableString = NSMutableAttributedString()
mutableString.append(NSAttributedString(attachment: imageAttachment))
attributedString.insert(mutableString, at: imageAtt.location)
}
case let fontAtt as LabelAttributeFontModel: case let fontAtt as LabelAttributeFontModel:
if let fontStyle = fontAtt.style { if let fontStyle = fontAtt.style {