diff --git a/NetNewsWire/Assets.xcassets/DetailStatusBarBackground.colorset/Contents.json b/NetNewsWire/Assets.xcassets/DetailStatusBarBackground.colorset/Contents.json new file mode 100644 index 000000000..6c9585ca9 --- /dev/null +++ b/NetNewsWire/Assets.xcassets/DetailStatusBarBackground.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.940", + "alpha" : "1.000", + "blue" : "0.940", + "green" : "0.940" + } + } + } + ] +} \ No newline at end of file diff --git a/NetNewsWire/Inspector/FeedInspectorViewController.swift b/NetNewsWire/Inspector/FeedInspectorViewController.swift index 1172da017..64bd3d9e7 100644 --- a/NetNewsWire/Inspector/FeedInspectorViewController.swift +++ b/NetNewsWire/Inspector/FeedInspectorViewController.swift @@ -42,10 +42,8 @@ final class FeedInspectorViewController: NSViewController, Inspector { // MARK: NSViewController override func viewDidLoad() { - imageView!.wantsLayer = true - let cornerRadius = appDelegate.currentTheme.float(forKey: "MainWindow.Timeline.cell.avatarCornerRadius") - imageView!.layer?.cornerRadius = cornerRadius + imageView!.layer?.cornerRadius = 4.0 updateUI() diff --git a/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift b/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift index 008f05f19..0d1bfb6de 100644 --- a/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift +++ b/NetNewsWire/MainWindow/Detail/DetailStatusBarView.swift @@ -56,7 +56,7 @@ final class DetailStatusBarView: NSView { didConfigureLayerRadius = true } - let color = self.effectiveAppearance.isDarkMode ? NSColor.textBackgroundColor : appDelegate.currentTheme.color(forKey: "MainWindow.Detail.statusBar.backgroundColor") + let color = self.effectiveAppearance.isDarkMode ? NSColor.textBackgroundColor : NSColor(named: "DetailStatusBarBackground")! layer.backgroundColor = color.cgColor } }