From a936c34c53113f7e9abef51dcaaff9e6f8c043ef Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 30 Jan 2019 21:51:35 -0800
Subject: [PATCH] Further tighten up the timeline. Align the top of the avatar
 with the top of the text.

---
 .../Timeline/Cell/TimelineCellAppearance.swift  |  2 --
 .../Timeline/Cell/TimelineCellLayout.swift      | 17 +++++++++--------
 NetNewsWire/Resources/DB5.plist                 |  6 ++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
index 2d53376d4..0c6b7eaa7 100644
--- a/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
+++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
@@ -42,7 +42,6 @@ struct TimelineCellAppearance: Equatable {
 	let drawsGrid: Bool
 
 	let avatarSize: NSSize
-	let avatarMarginRight: CGFloat
 	let avatarMarginLeft: CGFloat
 	let avatarAdjustmentTop: CGFloat
 	let avatarCornerRadius: CGFloat
@@ -87,7 +86,6 @@ struct TimelineCellAppearance: Equatable {
 		self.drawsGrid = theme.bool(forKey: "MainWindow.Timeline.drawsGrid")
 		
 		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")
diff --git a/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift
index d8aed54db..ce39bd8fa 100644
--- a/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift
+++ b/NetNewsWire/MainWindow/Timeline/Cell/TimelineCellLayout.swift
@@ -205,14 +205,15 @@ private extension TimelineCellLayout {
 		}
 		r.size = appearance.avatarSize
 		r.origin.x = (width - appearance.cellPadding.right) - r.size.width
-		r = RSRectCenteredVerticallyInRect(r, textBoxRect)
-		if height > 0.1 {
-			let bounds = NSRect(x: 0.0, y: 0.0, width: width, height: height)
-			r = RSRectCenteredVerticallyInRect(r, bounds)
-		}
-		else {
-			r = RSRectCenteredVerticallyInRect(r, textBoxRect)
-		}
+		r.origin.y = textBoxRect.origin.y + 4.0
+//		r = RSRectCenteredVerticallyInRect(r, textBoxRect)
+//		if height > 0.1 {
+//			let bounds = NSRect(x: 0.0, y: 0.0, width: width, height: height)
+//			r = RSRectCenteredVerticallyInRect(r, bounds)
+//		}
+//		else {
+//			r = RSRectCenteredVerticallyInRect(r, textBoxRect)
+//		}
 
 		return r
 	}
diff --git a/NetNewsWire/Resources/DB5.plist b/NetNewsWire/Resources/DB5.plist
index 064ab1630..037cb3fc0 100644
--- a/NetNewsWire/Resources/DB5.plist
+++ b/NetNewsWire/Resources/DB5.plist
@@ -76,9 +76,9 @@
 				<key>cell</key>
 				<dict>
 					<key>paddingLeft</key>
-					<integer>20</integer>
+					<integer>18</integer>
 					<key>paddingRight</key>
-					<integer>20</integer>
+					<integer>18</integer>
 					<key>paddingTop</key>
 					<integer>8</integer>
 					<key>paddingBottom</key>
@@ -111,8 +111,6 @@
 					<integer>48</integer>
 					<key>avatarWidth</key>
 					<integer>48</integer>
-					<key>avatarMarginRight</key>
-					<integer>20</integer>
 					<key>avatarMarginLeft</key>
 					<integer>8</integer>
 					<key>avatarAdjustmentTop</key>