renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

implement dynamic type for master feed list

Browse Source
This commit is contained in:
Maurice Parker
2019-04-28 10:31:35 -05:00
parent 5fc3fee12d
commit d7391b208d
8 changed files with 140 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift
View File

@@ -243,14 +243,3 @@ private extension MasterTimelineCellLayout {
return r
}
}
private extension Array where Element == CGRect {
func maxY() -> CGFloat {
var y: CGFloat = 0.0
self.forEach { y = Swift.max(y, $0.maxY) }
return y
}
}

9
iOS/MasterTimeline/Cell/MultilineUILabelSizer.swift
View File

@@ -98,9 +98,12 @@ private extension MultilineUILabelSizer {
}
var height = MultilineUILabelSizer.calculateHeight(string, width, font)
let maxHeight = singleLineHeightEstimate * numberOfLines
if height > maxHeight {
height = maxHeight
if numberOfLines != 0 {
let maxHeight = singleLineHeightEstimate * numberOfLines
if height > maxHeight {
height = maxHeight
}
}
cache[string]![width] = height