diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift
index 022930361..611d6a41d 100644
--- a/Evergreen/AppDelegate.swift
+++ b/Evergreen/AppDelegate.swift
@@ -122,7 +122,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
currentTheme = themeLoader.defaultTheme
- let faviconsFolder = RSDataSubfolder(nil, "Accounts")!
+ let faviconsFolder = RSDataSubfolder(nil, "Favicons")!
faviconDownloader = FaviconDownloader(folder: faviconsFolder)
let todayFeed = SmartFeed(delegate: TodayFeedDelegate())
diff --git a/Evergreen/Base.lproj/MainWindow.storyboard b/Evergreen/Base.lproj/MainWindow.storyboard
index 19905ffce..2123d5f56 100644
--- a/Evergreen/Base.lproj/MainWindow.storyboard
+++ b/Evergreen/Base.lproj/MainWindow.storyboard
@@ -428,9 +428,9 @@
-
+
-
+
diff --git a/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift b/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift
index 28f0fd512..6e26f7f5b 100644
--- a/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift
+++ b/Evergreen/MainWindow/Sidebar/Cell/SidebarCell.swift
@@ -13,13 +13,18 @@ private var textSizeCache = [String: NSSize]()
class SidebarCell : NSTableCellView {
- var image: NSImage?
+ var image: NSImage? {
+ didSet {
+ imageView?.image = shouldShowImage ? image : nil
+ }
+ }
var shouldShowImage = false {
didSet {
if shouldShowImage != oldValue {
needsLayout = true
}
+ imageView?.image = shouldShowImage ? image : nil
}
}
diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
index f94d1029b..2ec301d64 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
@@ -336,10 +336,10 @@ private extension SidebarViewController {
func imageFor(_ node: Node) -> NSImage? {
-// if let feed = node.representedObject as? Feed {
-//
-// }
- return nil
+ guard let feed = node.representedObject as? Feed else {
+ return nil
+ }
+ return appDelegate.faviconDownloader.favicon(for: feed)
}
func nameFor(_ node: Node) -> String {