From 229a376a8633a496697091afb6f02a1cc19ede3f Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 29 Nov 2017 13:10:01 -0800
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20avatars=20in=20the=20tim?=
 =?UTF-8?q?eline=20(for=20now).=20Also:=20align=20to=20the=20top,=20and=20?=
 =?UTF-8?q?scale=20down-only=20(not=20up).=20This=20will=20allow=20us=20to?=
 =?UTF-8?q?=20use=20favicons=20when=20a=20bigger=20icon=20isn=E2=80=99t=20?=
 =?UTF-8?q?available.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cell/TimelineCellAppearance.swift         |  2 +-
 .../Timeline/Cell/TimelineTableCellView.swift | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
index 588b0ad33..40377440e 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellAppearance.swift
@@ -73,7 +73,7 @@ struct TimelineCellAppearance {
 		self.avatarMarginRight = theme.float(forKey: "MainWindow.Timeline.cell.avatarMarginRight")
 		self.avatarAdjustmentTop = theme.float(forKey: "MainWindow.Timeline.cell.avatarAdjustmentTop")
 		
-		self.boxLeftMargin = self.cellPadding.left + self.unreadCircleDimension + self.unreadCircleMarginRight + self.avatarSize.width + self.avatarMarginRight
+		self.boxLeftMargin = self.cellPadding.left + self.unreadCircleDimension + self.unreadCircleMarginRight //+ self.avatarSize.width + self.avatarMarginRight
 	}
 }
 
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift
index 4a1e28c67..dd37e3ae1 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineTableCellView.swift
@@ -18,8 +18,9 @@ class TimelineTableCellView: NSTableCellView {
 
 	let avatarImageView: NSImageView = {
 		let imageView = NSImageView(frame: NSRect.zero)
-		imageView.imageScaling = .scaleProportionallyUpOrDown
+		imageView.imageScaling = .scaleProportionallyDown
 		imageView.animates = false
+		imageView.imageAlignment = .alignTop
 		return imageView
 	}()
 
@@ -176,15 +177,15 @@ class TimelineTableCellView: NSTableCellView {
 
 	private func updateAvatar() {
 
-		if let image = cellData.avatar {
-			if avatarImageView.image !== image {
-				avatarImageView.image = image
-			}
-			avatarImageView.isHidden = false
-		}
-		else {
-			avatarImageView.isHidden = true
-		}
+//		if let image = cellData.avatar {
+//			if avatarImageView.image !== image {
+//				avatarImageView.image = image
+//			}
+//			avatarImageView.isHidden = false
+//		}
+//		else {
+//			avatarImageView.isHidden = true
+//		}
 	}
 
 	private func updateSubviews() {