FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove icons for smart feeds and folders.

This commit is contained in:
Maurice Parker 2019-04-18 14:20:47 -05:00
parent 1e23ead8c6
commit 04dab356eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iOS/Master/Cell/MasterTableViewCellLayout.swift
View File

@ -12,7 +12,7 @@ import RSCore
struct MasterTableViewCellLayout {
private static let imageSize = CGSize(width: 16, height: 16)
private static let imageMarginLeft = CGFloat(integerLiteral: 8)
private static let marginLeft = CGFloat(integerLiteral: 8)
private static let imageMarginRight = CGFloat(integerLiteral: 8)
private static let unreadCountMarginLeft = CGFloat(integerLiteral: 8)
private static let unreadCountMarginRight = CGFloat(integerLiteral: 0)
@ -30,7 +30,7 @@ struct MasterTableViewCellLayout {
// Favicon
var rFavicon = CGRect.zero
if shouldShowImage {
var indentX = showingEditingControl ? MasterTableViewCellLayout.imageMarginLeft + 40 : MasterTableViewCellLayout.imageMarginLeft
var indentX = showingEditingControl ? MasterTableViewCellLayout.marginLeft + 40 : MasterTableViewCellLayout.marginLeft
indentX = indent ? indentX + 20 : indentX
rFavicon = CGRect(x: indentX, y: 0.0, width: MasterTableViewCellLayout.imageSize.width, height: MasterTableViewCellLayout.imageSize.height)
rFavicon = MasterTableViewCellLayout.centerVertically(rFavicon, bounds)
@ -44,7 +44,7 @@ struct MasterTableViewCellLayout {
if shouldShowImage {
rLabel.origin.x = rFavicon.maxX + MasterTableViewCellLayout.imageMarginRight
} else {
rLabel.origin.x = indent ? 20 : 0
rLabel.origin.x = indent ? MasterTableViewCellLayout.marginLeft + 10 : MasterTableViewCellLayout.marginLeft
}
rLabel = MasterTableViewCellLayout.centerVertically(rLabel, bounds)

2
iOS/Master/MasterViewController.swift
View File

@ -394,7 +394,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
cell.name = nameFor(node)
configureUnreadCount(cell, node)
configureFavicon(cell, node)
cell.shouldShowImage = node.representedObject is SmallIconProvider
cell.shouldShowImage = node.representedObject is Feed
}