diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index b9f702e03..f56c31354 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -122,15 +122,11 @@ struct AppAssets { }() static var searchFeedImage: IconImage = { - return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!) + return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true) }() - static var smartFeedImage: RSImage = { - return RSImage(named: NSImage.smartBadgeTemplateName)! - }() - static var starredFeedImage: IconImage = { - return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!) + return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true) }() static var timelineStar: RSImage! = { @@ -138,11 +134,11 @@ struct AppAssets { }() static var todayFeedImage: IconImage = { - return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!) + return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true) }() static var unreadFeedImage: IconImage = { - return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!) + return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true) }() static var swipeMarkReadImage: RSImage = { diff --git a/Mac/MainWindow/IconView.swift b/Mac/MainWindow/IconView.swift index c279da2f4..bd84ed41b 100644 --- a/Mac/MainWindow/IconView.swift +++ b/Mac/MainWindow/IconView.swift @@ -84,9 +84,8 @@ final class IconView: NSView { } override func draw(_ dirtyRect: NSRect) { - guard hasExposedVerticalBackground || !isDisconcernable else { - return - } + guard !(iconImage?.isSymbol ?? true) else { return } + guard hasExposedVerticalBackground || !isDisconcernable else { return } let color = NSApplication.shared.effectiveAppearance.isDarkMode ? IconView.darkBackgroundColor : IconView.lightBackgroundColor color.set() diff --git a/Shared/SmartFeeds/PseudoFeed.swift b/Shared/SmartFeeds/PseudoFeed.swift index 2fd0d9d6c..622e1b32f 100644 --- a/Shared/SmartFeeds/PseudoFeed.swift +++ b/Shared/SmartFeeds/PseudoFeed.swift @@ -29,9 +29,3 @@ protocol PseudoFeed: class, Feed, SmallIconProvider { } #endif - -extension PseudoFeed { - var smallIcon: RSImage? { - return AppAssets.smartFeedImage - } -}