FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 20:16:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Give disclosure triangles their own gutter. Issue #1210

Browse Source
This commit is contained in:
Maurice Parker 2019-10-29 17:55:49 -05:00
parent 6b6afd9260
commit d537799969
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift
View File

@ -14,7 +14,7 @@ struct MasterFeedTableViewCellLayout {
private static let editingControlIndent = CGFloat(integerLiteral: 40) private static let editingControlIndent = CGFloat(integerLiteral: 40)
private static let imageSize = CGSize(width: 24, height: 24) private static let imageSize = CGSize(width: 24, height: 24)
private static let imageMarginRight = CGFloat(integerLiteral: 11) private static let imageMarginRight = CGFloat(integerLiteral: 11)
private static let unreadCountMarginLeft = CGFloat(integerLiteral: 8) private static let labelMarginRight = CGFloat(integerLiteral: 8)
private static let unreadCountMarginRight = CGFloat(integerLiteral: 16) private static let unreadCountMarginRight = CGFloat(integerLiteral: 16)
private static let disclosureButtonSize = CGSize(width: 44, height: 44) private static let disclosureButtonSize = CGSize(width: 44, height: 44)
private static let verticalPadding = CGFloat(integerLiteral: 11) private static let verticalPadding = CGFloat(integerLiteral: 11)
@ -35,7 +35,7 @@ struct MasterFeedTableViewCellLayout {
var initialIndent = insets.left var initialIndent = insets.left
if indent { if indent {
initialIndent += MasterFeedTableViewCellLayout.imageSize.width + MasterFeedTableViewCellLayout.imageMarginRight initialIndent += MasterFeedTableViewCellLayout.disclosureButtonSize.width
} }
if showingEditingControl { if showingEditingControl {
initialIndent += MasterFeedTableViewCellLayout.editingControlIndent initialIndent += MasterFeedTableViewCellLayout.editingControlIndent
@ -53,7 +53,7 @@ struct MasterFeedTableViewCellLayout {
// Favicon // Favicon
var rFavicon = CGRect.zero var rFavicon = CGRect.zero
if !shouldShowDisclosure { if !shouldShowDisclosure {
let x = bounds.origin.x + ((MasterFeedTableViewCellLayout.disclosureButtonSize.width - MasterFeedTableViewCellLayout.imageSize.width) / 2) let x = bounds.origin.x
let y = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding) + let y = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding) +
label.font.lineHeight / 2.0 - label.font.lineHeight / 2.0 -
MasterFeedTableViewCellLayout.imageSize.height / 2.0 MasterFeedTableViewCellLayout.imageSize.height / 2.0
@ -74,11 +74,23 @@ struct MasterFeedTableViewCellLayout {
} }
// Title // Title
let labelWidth = bounds.width - (rFavicon.width + MasterFeedTableViewCellLayout.imageMarginRight + MasterFeedTableViewCellLayout.unreadCountMarginLeft + rUnread.width + MasterFeedTableViewCellLayout.disclosureButtonSize.width + MasterFeedTableViewCellLayout.unreadCountMarginRight)
let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
let rLabelx = bounds.minX + MasterFeedTableViewCellLayout.disclosureButtonSize.width var rLabelx = CGFloat.zero
if shouldShowDisclosure {
rLabelx = bounds.minX + MasterFeedTableViewCellLayout.disclosureButtonSize.width
} else {
rLabelx = rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight
}
let rLabely = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding) let rLabely = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding)
var labelWidth = CGFloat.zero
if !unreadCountIsHidden {
labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight + (cellWidth - rUnread.minX))
} else {
labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight)
}
let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
let rLabel = CGRect(x: rLabelx, y: rLabely, width: labelSizeInfo.size.width, height: labelSizeInfo.size.height) let rLabel = CGRect(x: rLabelx, y: rLabely, width: labelSizeInfo.size.width, height: labelSizeInfo.size.height)
// Determine cell height // Determine cell height
@ -99,12 +111,7 @@ struct MasterFeedTableViewCellLayout {
} }
// Separator Insets // Separator Insets
var separatorInset = CGFloat.zero let separatorInset = MasterFeedTableViewCellLayout.disclosureButtonSize.width
if shouldShowDisclosure {
separatorInset = MasterFeedTableViewCellLayout.disclosureButtonSize.width
} else {
separatorInset = rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight
}
separatorRect = CGRect(x: separatorInset, y: cellHeight - 0.5, width: cellWidth - separatorInset, height: 0.5) separatorRect = CGRect(x: separatorInset, y: cellHeight - 0.5, width: cellWidth - separatorInset, height: 0.5)
// Assign the properties // Assign the properties

6
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -622,10 +622,10 @@ private extension MasterFeedViewController {
func configure(_ cell: MasterFeedTableViewCell, _ node: Node) { func configure(_ cell: MasterFeedTableViewCell, _ node: Node) {
cell.delegate = self cell.delegate = self
if node.parent?.representedObject is Folder { if node.representedObject is Folder {
cell.indentationLevel = 1
} else {
cell.indentationLevel = 0 cell.indentationLevel = 0
} else {
cell.indentationLevel = 1
} }
cell.setDisclosure(isExpanded: node.isExpanded, animated: false) cell.setDisclosure(isExpanded: node.isExpanded, animated: false)
cell.isDisclosureAvailable = node.canHaveChildNodes cell.isDisclosureAvailable = node.canHaveChildNodes