From 4c5bdf99a20094f0d5ae4b5e4b00dfa85c4e1451 Mon Sep 17 00:00:00 2001 From: Michael Griebling Date: Mon, 16 Jan 2023 17:03:29 -0500 Subject: [PATCH] Make labelMode, textAlignment, and currentStyle public variables. --- .../MathRender/MTMathList.swift | 2 -- .../MathRender/MTMathUILabel.swift | 19 +++---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Sources/SwiftMathRender/MathRender/MTMathList.swift b/Sources/SwiftMathRender/MathRender/MTMathList.swift index 3d473a4..6845414 100644 --- a/Sources/SwiftMathRender/MathRender/MTMathList.swift +++ b/Sources/SwiftMathRender/MathRender/MTMathList.swift @@ -129,7 +129,6 @@ public class MTMathAtom: NSObject { } } public var nucleus: String = "" - // public var childAtoms = [MTMathAtom]() // atoms that fused to create this one public var indexRange = NSRange(location: 0, length: 0) // indexRange in list that this atom tracks: var fontStyle: MTFontStyle = .defaultStyle @@ -143,7 +142,6 @@ public class MTMathAtom: NSObject { self.superScript = MTMathList(atom.superScript) self.indexRange = atom.indexRange self.fontStyle = atom.fontStyle - // self.childAtoms = [MTMathAtom](atom.childAtoms) self.fusedAtoms = atom.fusedAtoms } diff --git a/Sources/SwiftMathRender/MathRender/MTMathUILabel.swift b/Sources/SwiftMathRender/MathRender/MTMathUILabel.swift index b8c737b..d18c3ee 100644 --- a/Sources/SwiftMathRender/MathRender/MTMathUILabel.swift +++ b/Sources/SwiftMathRender/MathRender/MTMathUILabel.swift @@ -140,7 +140,7 @@ public class MTMathUILabel : MTView { } /** The Label mode for the label. The default mode is Display */ - var labelMode = MTMathUILabelMode.display { + public var labelMode = MTMathUILabelMode.display { didSet { self.invalidateIntrinsicContentSize() self.setNeedsLayout() @@ -148,7 +148,7 @@ public class MTMathUILabel : MTView { } /** Horizontal alignment for the text. The default is align left. */ - var textAlignment = MTTextAlignment.left { + public var textAlignment = MTTextAlignment.left { didSet { self.invalidateIntrinsicContentSize() self.setNeedsLayout() @@ -158,7 +158,7 @@ public class MTMathUILabel : MTView { /** The internal display of the MTMathUILabel. This is for advanced use only. */ var displayList: MTMathListDisplay? = nil - var currentStyle:MTLineStyle { + public var currentStyle:MTLineStyle { switch labelMode { case .display: return .display case .text: return .text @@ -273,17 +273,4 @@ public class MTMathUILabel : MTView { } #endif -// #if os(macOS) -// override public var isFlipped: Bool { false } -// func setNeedsDisplay() { self.needsDisplay = true } -// func setNeedsLayout() { self.needsLayout = true } -// override public func layout() { -// self._layoutSubviews() -// super.layout() -// } -// #else -// override public func layoutSubviews() { self._layoutSubviews() } -// override public func sizeThatFits(_ size: CGSize) -> CGSize { self._sizeThatFits(size) } -// #endif - }