Skip to content

Commit 46cba25

Browse files
committed
numberOfLines fix
1 parent 75c3514 commit 46cba25

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

LayoutOps/LayoutOps/LabelNode.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ import UIKit
88
public struct LabelNodeEstimation {
99
public let length: Int
1010
public let font: UIFont
11-
public let numberOfLines: Int
1211
public let lineSpacing: CGFloat
1312
public let lineHeightMultiple: CGFloat
1413

1514
public init(length: Int, font: UIFont, numberOfLines: Int = 1, lineSpacing: CGFloat = 0, lineHeightMultiple: CGFloat = 1.2) {
1615
self.length = length
1716
self.font = font
18-
self.numberOfLines = numberOfLines
1917
self.lineSpacing = lineSpacing
2018
self.lineHeightMultiple = lineHeightMultiple
2119
}
@@ -91,12 +89,12 @@ open class LabelNode: AnyNode {
9189
}
9290

9391

94-
func estimatedHeightWithFont(estimation: LabelNodeEstimation, width: CGFloat) -> CGFloat {
92+
private func estimatedHeightWithFont(estimation: LabelNodeEstimation, width: CGFloat) -> CGFloat {
9593

9694
let numberOfLettersPerLine = width/font.xHeight
9795
let numberOfLines = Int(round(CGFloat(estimation.length)/numberOfLettersPerLine))
9896

99-
let finalNumberOfLines = min(numberOfLines, (estimation.numberOfLines == 0) ? Int.max : estimation.numberOfLines)
97+
let finalNumberOfLines = min(numberOfLines, (numberOfLines == 0) ? Int.max : numberOfLines)
10098

10199
return CGFloat(finalNumberOfLines)*font.lineHeight*estimation.lineHeightMultiple + CGFloat(finalNumberOfLines - 1)*estimation.lineSpacing
102100

0 commit comments

Comments
 (0)