renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mac-candidate' of https://github.com/Ranchero-Software/NetNewsWire into mac-candidate

Browse Source
This commit is contained in:
Brent Simmons
2021-03-06 14:52:24 -08:00
parent 4abd53b0ba a7abde04ab
commit f8ae8d2821
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Mac/MainWindow/IconView.swift
View File

@@ -17,15 +17,15 @@ final class IconView: NSView {
if NSApplication.shared.effectiveAppearance.isDarkMode {
if self.iconImage?.isDark ?? false {
self.isDisconcernable = false
self.isDiscernable = false
} else {
self.isDisconcernable = true
self.isDiscernable = true
}
} else {
if self.iconImage?.isBright ?? false {
self.isDisconcernable = false
self.isDiscernable = false
} else {
self.isDisconcernable = true
self.isDiscernable = true
}
}
@@ -35,7 +35,7 @@ final class IconView: NSView {
}
}
private var isDisconcernable = true
private var isDiscernable = true
override var isFlipped: Bool {
return true
@@ -85,7 +85,7 @@ final class IconView: NSView {
override func draw(_ dirtyRect: NSRect) {
guard !(iconImage?.isBackgroundSupressed ?? false) else { return }
guard hasExposedVerticalBackground || !isDisconcernable else { return }
guard hasExposedVerticalBackground || !isDiscernable else { return }
let color = NSApplication.shared.effectiveAppearance.isDarkMode ? IconView.darkBackgroundColor : IconView.lightBackgroundColor
color.set()