From deb723691cf232c4652e1dbaa4e0933383d8dcca Mon Sep 17 00:00:00 2001 From: Michael Griebling Date: Wed, 18 Jan 2023 16:35:19 -0500 Subject: [PATCH] Fix crash on displayList. --- Sources/SwiftMath/MathRender/MTMathUILabel.swift | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Sources/SwiftMath/MathRender/MTMathUILabel.swift b/Sources/SwiftMath/MathRender/MTMathUILabel.swift index a46b706..dc9f4a2 100644 --- a/Sources/SwiftMath/MathRender/MTMathUILabel.swift +++ b/Sources/SwiftMath/MathRender/MTMathUILabel.swift @@ -267,18 +267,15 @@ public class MTMathUILabel : MTView { } func _sizeThatFits(_ size:CGSize) -> CGSize { + guard _mathList != nil else { return size } var size = size var displayList:MTMathListDisplay? = nil - if _mathList != nil { - displayList = MTTypesetter.createLineForMathList(_mathList, font: font, style: currentStyle) - } + displayList = MTTypesetter.createLineForMathList(_mathList, font: font, style: currentStyle) size.width = displayList!.width + contentInsets.left + contentInsets.right size.height = displayList!.ascent + displayList!.descent + contentInsets.top + contentInsets.bottom return size } - //override public var intrinsicContentSize: CGSize { _sizeThatFits(CGSizeZero) } - #if os(macOS) func setNeedsDisplay() { self.needsDisplay = true } func setNeedsLayout() { self.needsLayout = true }