Rewrite much of the timeline cell layout code. Move avatars to the right.

Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift

@@ -38,6 +38,7 @@ struct TimelineCellAppearance: Equatable {
 
 	let avatarSize: NSSize
 	let avatarMarginRight: CGFloat
+	let avatarMarginLeft: CGFloat
 	let avatarAdjustmentTop: CGFloat
 	let avatarCornerRadius: CGFloat
 	let showAvatar: Bool
@@ -76,14 +77,15 @@ struct TimelineCellAppearance: Equatable {
 		
 		self.avatarSize = theme.size(forKey: "MainWindow.Timeline.cell.avatar")
 		self.avatarMarginRight = theme.float(forKey: "MainWindow.Timeline.cell.avatarMarginRight")
+		self.avatarMarginLeft = theme.float(forKey: "MainWindow.Timeline.cell.avatarMarginLeft")
 		self.avatarAdjustmentTop = theme.float(forKey: "MainWindow.Timeline.cell.avatarAdjustmentTop")
 		self.avatarCornerRadius = theme.float(forKey: "MainWindow.Timeline.cell.avatarCornerRadius")
 		self.showAvatar = showAvatar
 
-		var margin = self.cellPadding.left + self.unreadCircleDimension + self.unreadCircleMarginRight
+		let margin = self.cellPadding.left + self.unreadCircleDimension + self.unreadCircleMarginRight
-		if showAvatar {
+//		if showAvatar {
-			margin += (self.avatarSize.width + self.avatarMarginRight)
+//			margin += (self.avatarSize.width + self.avatarMarginRight)
-		}
+//		}
 		self.boxLeftMargin = margin
 	}
 

Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift

@@ -32,116 +32,137 @@ struct TimelineCellLayout {
 		self.starRect = starRect
 		self.avatarImageRect = avatarImageRect
 		self.paddingBottom = paddingBottom
-		
+
-		var height = max(0, feedNameRect.maxY)
+		self.height = [feedNameRect, dateRect, titleRect, unreadIndicatorRect, avatarImageRect].maxY() + paddingBottom
-		height = max(height, dateRect.maxY)
+	}
-		height = max(height, titleRect.maxY)
+
-		height = max(height, unreadIndicatorRect.maxY)
+	init(width: CGFloat, cellData: TimelineCellData, appearance: TimelineCellAppearance) {
-		height = max(height, avatarImageRect.maxY)
+
-		height += paddingBottom
+		var textBoxRect = TimelineCellLayout.rectForTextBox(appearance, cellData, width)
-		self.height = height
+
+		let (titleRect, titleLine1Rect) = TimelineCellLayout.rectsForTitle(textBoxRect, cellData)
+		let dateRect = TimelineCellLayout.rectForDate(textBoxRect, titleRect, appearance, cellData)
+		let feedNameRect = TimelineCellLayout.rectForFeedName(textBoxRect, dateRect, appearance, cellData)
+		let unreadIndicatorRect = TimelineCellLayout.rectForUnreadIndicator(appearance, titleLine1Rect)
+		let starRect = TimelineCellLayout.rectForStar(appearance, unreadIndicatorRect)
+
+		textBoxRect.size.height = ceil([titleRect, dateRect, feedNameRect].maxY() - textBoxRect.origin.y)
+		let avatarImageRect = TimelineCellLayout.rectForAvatar(cellData, appearance, textBoxRect, width)
+
+		let paddingBottom = appearance.cellPadding.bottom
+
+		self.init(width: width, feedNameRect: feedNameRect, dateRect: dateRect, titleRect: titleRect, unreadIndicatorRect: unreadIndicatorRect, starRect: starRect, avatarImageRect: avatarImageRect, paddingBottom: paddingBottom)
+	}
+
+	static func height(for width: CGFloat, cellData: TimelineCellData, appearance: TimelineCellAppearance) -> CGFloat {
+
+		let layout = TimelineCellLayout(width: width, cellData: cellData, appearance: appearance)
+		return layout.height
 	}
 }
 
-private func rectForDate(_ cellData: TimelineCellData, _ width: CGFloat, _ appearance: TimelineCellAppearance, _ titleRect: NSRect) -> NSRect {
+// MARK: - Calculate Rects
-	
-	let renderer = RSSingleLineRenderer(attributedTitle: cellData.attributedDateString)
-	var r = NSZeroRect
-	r.size = renderer.size
 
-	r.origin.y = NSMaxY(titleRect) + appearance.titleBottomMargin
+private extension TimelineCellLayout {
-	r.origin.x = appearance.boxLeftMargin
-	
-	r.size.width = min(width - (r.origin.x + appearance.cellPadding.right), r.size.width)
-	r.size.width = max(r.size.width, 0.0)
 
-	return r
+	static func rectForTextBox(_ appearance: TimelineCellAppearance, _ cellData: TimelineCellData, _ width: CGFloat) -> NSRect {
-}
 
-private func rectForFeedName(_ cellData: TimelineCellData, _ width: CGFloat, _ appearance: TimelineCellAppearance, _ dateRect: NSRect) -> NSRect {
+		// Returned height is a placeholder. Not needed when this is calculated.
-	
+
-	if !cellData.showFeedName {
+		let textBoxOriginX = appearance.cellPadding.left + appearance.unreadCircleDimension + appearance.unreadCircleMarginRight
-		return NSZeroRect
+		let textBoxMaxX = floor((width - appearance.cellPadding.right) - (cellData.showAvatar ? appearance.avatarSize.width + appearance.avatarMarginLeft : 0.0))
+		let textBoxWidth = floor(textBoxMaxX - textBoxOriginX)
+		let textBoxRect = NSRect(x: textBoxOriginX, y: appearance.cellPadding.top, width: textBoxWidth, height: 1000000)
+
+		return textBoxRect
 	}
 
-	let renderer = RSSingleLineRenderer(attributedTitle: cellData.attributedFeedName)
+	static func rectsForTitle(_ textBoxRect: NSRect, _ cellData: TimelineCellData) -> (NSRect, NSRect) {
-	var r = NSZeroRect
-	r.size = renderer.size
-	r.origin.y = NSMaxY(dateRect) + appearance.titleBottomMargin
-	r.origin.x = appearance.boxLeftMargin
-	
-	r.size.width = max(0, width - (r.origin.x + appearance.cellPadding.right))
-	
-	return r
-}
 
-private func rectsForTitle(_ cellData: TimelineCellData, _ width: CGFloat, _ appearance: TimelineCellAppearance) -> (NSRect, NSRect) {
+		var r = textBoxRect
-	
+		let renderer = RSMultiLineRenderer(attributedTitle: cellData.attributedTitle)
-	var r = NSZeroRect
-	r.origin.x = appearance.boxLeftMargin
-	r.origin.y = appearance.cellPadding.top
 
-	let textWidth = width - (r.origin.x + appearance.cellPadding.right)
+		let measurements = renderer.measurements(forWidth: textBoxRect.width)
-	let renderer = RSMultiLineRenderer(attributedTitle: cellData.attributedTitle)
+		r.size.height = CGFloat(measurements.height)
 
-	let measurements = renderer.measurements(forWidth: textWidth)
+		var rline1 = r
-	r.size = NSSize(width: textWidth, height: CGFloat(measurements.height))
+		rline1.size.height = CGFloat(measurements.heightOfFirstLine)
-	r.size.width = max(r.size.width, 0.0)
 
-	var rline1 = r
+		return (r, rline1)
-	rline1.size.height = CGFloat(measurements.heightOfFirstLine)
+	}
-	
-	return (r, rline1)
-}
 
-private func rectForUnreadIndicator(_ cellData: TimelineCellData, _ appearance: TimelineCellAppearance, _ titleLine1Rect: NSRect) -> NSRect {
+	static func rectForDate(_ textBoxRect: NSRect, _ titleRect: NSRect, _ appearance: TimelineCellAppearance, _ cellData: TimelineCellData) -> NSRect {
-	
-	var r = NSZeroRect
-	r.size = NSSize(width: appearance.unreadCircleDimension, height: appearance.unreadCircleDimension)
-	r.origin.x = appearance.cellPadding.left
-	r = RSRectCenteredVerticallyInRect(r, titleLine1Rect)
-	r.origin.y += 1
-	
-	return r
-}
 
-private func rectForStar(_ cellData: TimelineCellData, _ appearance: TimelineCellAppearance, _ unreadIndicatorRect: NSRect) -> NSRect {
+		return rectOfLineBelow(textBoxRect, titleRect, appearance.titleBottomMargin, cellData.attributedDateString)
+	}
 
-	var r = NSRect.zero
+	static func rectForFeedName(_ textBoxRect: NSRect, _ dateRect: NSRect, _ appearance: TimelineCellAppearance, _ cellData: TimelineCellData) -> NSRect {
-	r.size.width = appearance.starDimension
-	r.size.height = appearance.starDimension
-	r.origin.x = floor(unreadIndicatorRect.origin.x - ((appearance.starDimension - appearance.unreadCircleDimension) / 2.0))
-	r.origin.y = unreadIndicatorRect.origin.y - 3.0
-	return r
-}
 
-private func rectForAvatar(_ cellData: TimelineCellData, _ appearance: TimelineCellAppearance, _ titleLine1Rect: NSRect) -> NSRect {
+		if !cellData.showFeedName {
+			return NSZeroRect
+		}
+
+		return rectOfLineBelow(textBoxRect, dateRect, appearance.titleBottomMargin, cellData.attributedFeedName)
+	}
+
+	static func rectOfLineBelow(_ textBoxRect: NSRect, _ rectAbove: NSRect, _ topMargin: CGFloat, _ attributedString: NSAttributedString) -> NSRect {
+
+		let renderer = RSSingleLineRenderer(attributedTitle: attributedString)
+		var r = NSZeroRect
+		r.size = renderer.size
+		r.origin.y = NSMaxY(rectAbove) + topMargin
+		r.origin.x = textBoxRect.origin.x
+
+		var width = renderer.size.width
+		width = min(width, textBoxRect.size.width)
+		width = max(width, 0.0)
+		r.size.width = width
 
-	var r = NSRect.zero
-	if !cellData.showAvatar {
 		return r
 	}
-	r.size = appearance.avatarSize
-	r.origin.x = appearance.cellPadding.left + appearance.unreadCircleDimension + appearance.unreadCircleMarginRight
-	r.origin.y = titleLine1Rect.minY + appearance.avatarAdjustmentTop
 
-	return r
+	static func rectForUnreadIndicator(_ appearance: TimelineCellAppearance, _ titleLine1Rect: NSRect) -> NSRect {
+
+		var r = NSZeroRect
+		r.size = NSSize(width: appearance.unreadCircleDimension, height: appearance.unreadCircleDimension)
+		r.origin.x = appearance.cellPadding.left
+		r = RSRectCenteredVerticallyInRect(r, titleLine1Rect)
+		r.origin.y += 1
+
+		return r
+	}
+
+	static func rectForStar(_ appearance: TimelineCellAppearance, _ unreadIndicatorRect: NSRect) -> NSRect {
+
+		var r = NSRect.zero
+		r.size.width = appearance.starDimension
+		r.size.height = appearance.starDimension
+		r.origin.x = floor(unreadIndicatorRect.origin.x - ((appearance.starDimension - appearance.unreadCircleDimension) / 2.0))
+		r.origin.y = unreadIndicatorRect.origin.y - 3.0
+		return r
+	}
+
+	static func rectForAvatar(_ cellData: TimelineCellData, _ appearance: TimelineCellAppearance, _ textBoxRect: NSRect, _ width: CGFloat) -> NSRect {
+
+		var r = NSRect.zero
+		if !cellData.showAvatar {
+			return r
+		}
+		r.size = appearance.avatarSize
+		r.origin.x = (width - appearance.cellPadding.right) - r.size.width
+		r = RSRectCenteredVerticallyInRect(r, textBoxRect)
+
+		return r
+	}
 }
 
-func timelineCellLayout(_ width: CGFloat, cellData: TimelineCellData, appearance: TimelineCellAppearance) -> TimelineCellLayout {
+private extension Array where Element == NSRect {
 
-	let (titleRect, titleLine1Rect) = rectsForTitle(cellData, width, appearance)
+	func maxY() -> CGFloat {
-	let dateRect = rectForDate(cellData, width, appearance, titleRect)
-	let feedNameRect = rectForFeedName(cellData, width, appearance, dateRect)
-	let unreadIndicatorRect = rectForUnreadIndicator(cellData, appearance, titleLine1Rect)
-	let starRect = rectForStar(cellData, appearance, unreadIndicatorRect)
-	let avatarImageRect = rectForAvatar(cellData, appearance, titleLine1Rect)
 
-	return TimelineCellLayout(width: width, feedNameRect: feedNameRect, dateRect: dateRect, titleRect: titleRect, unreadIndicatorRect: unreadIndicatorRect, starRect: starRect, avatarImageRect: avatarImageRect, paddingBottom: appearance.cellPadding.bottom)
+		var y: CGFloat = 0.0
+		self.forEach { y = Swift.max(y, $0.maxY) }
+		return y
+	}
 }
 
-func timelineCellHeight(_ width: CGFloat, cellData: TimelineCellData, appearance: TimelineCellAppearance) -> CGFloat {
-	
-	let layout = timelineCellLayout(width, cellData: cellData, appearance: appearance)
-	return layout.height
-}

Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift

@@ -161,7 +161,7 @@ private extension TimelineTableCellView {
 
 	func updatedLayoutRects() -> TimelineCellLayout {
 
-		return timelineCellLayout(NSWidth(bounds), cellData: cellData, appearance: cellAppearance)
+		return TimelineCellLayout(width: bounds.width, cellData: cellData, appearance: cellAppearance)
 	}
 
 	func updateAppearance() {

Evergreen/MainWindow/Timeline/TimelineViewController.swift

@@ -441,7 +441,7 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
 		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, feedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, bannerImageURL: nil, datePublished: nil, dateModified: nil, authors: nil, attachments: nil, status: status)
 		
 		let prototypeCellData = TimelineCellData(article: prototypeArticle, appearance: cellAppearance, showFeedName: showingFeedNames, feedName: "Prototype Feed Name", avatar: nil, showAvatar: false, featuredImage: nil)
-		let height = timelineCellHeight(100, cellData: prototypeCellData, appearance: cellAppearance)
+		let height = TimelineCellLayout.height(for: 100, cellData: prototypeCellData, appearance: cellAppearance)
 		return height
 	}
 

Evergreen/Resources/DB5.plist

@@ -76,13 +76,13 @@
 				<key>cell</key>
 				<dict>
 					<key>paddingLeft</key>
-					<integer>12</integer>
+					<integer>20</integer>
 					<key>paddingRight</key>
 					<integer>12</integer>
 					<key>paddingTop</key>
-					<integer>12</integer>
-					<key>paddingBottom</key>
 					<integer>14</integer>
+					<key>paddingBottom</key>
+					<integer>16</integer>
 					<key>feedNameColor</key>
 					<string>999999</string>
 					<key>faviconFeedNameSpacing</key>
@@ -110,6 +110,8 @@
 					<key>avatarWidth</key>
 					<integer>48</integer>
 					<key>avatarMarginRight</key>
+					<integer>20</integer>
+					<key>avatarMarginLeft</key>
 					<integer>8</integer>
 					<key>avatarAdjustmentTop</key>
 					<integer>4</integer>