diff --git a/iOS/Master/Cell/MasterTableViewCellLayout.swift b/iOS/Master/Cell/MasterTableViewCellLayout.swift index cf61a90ac..f22621742 100644 --- a/iOS/Master/Cell/MasterTableViewCellLayout.swift +++ b/iOS/Master/Cell/MasterTableViewCellLayout.swift @@ -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) diff --git a/iOS/Master/MasterViewController.swift b/iOS/Master/MasterViewController.swift index def7fd0c6..36fc0ed6b 100644 --- a/iOS/Master/MasterViewController.swift +++ b/iOS/Master/MasterViewController.swift @@ -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 }