From bb08cfaa5b138793bf43ccd322cbd648d4d6006c Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 21 Jan 2018 21:04:52 -0800 Subject: [PATCH] Increase the size of too-small favicons to 16x16 in the feed inspector. --- .../FeedInspectorViewController.swift | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Evergreen/Inspector/FeedInspectorViewController.swift b/Evergreen/Inspector/FeedInspectorViewController.swift index cdbfb17a1..56ff19767 100644 --- a/Evergreen/Inspector/FeedInspectorViewController.swift +++ b/Evergreen/Inspector/FeedInspectorViewController.swift @@ -81,16 +81,25 @@ private extension FeedInspectorViewController { func updateImage() { - guard let feed = feed, let image = image(for: feed) else { + guard let feed = feed else { imageView?.image = nil return } - imageView?.image = image - } - func image(for feed: Feed) -> NSImage? { + if let feedIcon = appDelegate.feedIconDownloader.icon(for: feed) { + imageView?.image = feedIcon + return + } + + if let favicon = appDelegate.faviconDownloader.favicon(for: feed) { + if favicon.size.height < 16.0 && favicon.size.width < 16.0 { + favicon.size = NSSize(width: 16, height: 16) + } + imageView?.image = favicon + return + } - return appDelegate.feedIconDownloader.icon(for: feed) ?? appDelegate.faviconDownloader.favicon(for: feed) + imageView?.image = nil } func updateName() {