From 9f8f3a6ecfd5ebaaa20addec730da6cbf5c9b6f7 Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Fri, 6 Dec 2019 17:44:03 -0500 Subject: [PATCH] Little bit of tidy up --- .../Browser/Album Browser/AlbumViewItem.swift | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Persephone/Components/Browser/Album Browser/AlbumViewItem.swift b/Persephone/Components/Browser/Album Browser/AlbumViewItem.swift index 8d4f803..cbbf9d8 100644 --- a/Persephone/Components/Browser/Album Browser/AlbumViewItem.swift +++ b/Persephone/Components/Browser/Album Browser/AlbumViewItem.swift @@ -60,17 +60,21 @@ class AlbumViewItem: NSCollectionViewItem { } func setAppearance(selected isSelected: Bool) { + guard let viewLayer = albumCoverView.layer, + let boxLayer = albumCoverBox.layer + else { return } + if #available(OSX 10.14, *) { let darkMode = NSApp.effectiveAppearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua - albumCoverView.layer?.borderColor = darkMode ? .albumBorderColorDark : .albumBorderColorLight - albumCoverBox.layer?.borderColor = isSelected ? NSColor.controlAccentColor.cgColor : CGColor.clear - albumCoverBox.layer?.backgroundColor = isSelected ? NSColor.controlAccentColor.cgColor : CGColor.clear + viewLayer.borderColor = darkMode ? .albumBorderColorDark : .albumBorderColorLight + boxLayer.borderColor = isSelected ? NSColor.controlAccentColor.cgColor : CGColor.clear + boxLayer.backgroundColor = albumCoverBox.layer?.borderColor } else { - albumCoverView.layer?.borderColor = .albumBorderColorLight - albumCoverBox.layer?.borderColor = isSelected ? NSColor.selectedControlColor.cgColor : CGColor.clear - albumCoverBox.layer?.backgroundColor = isSelected ? NSColor.selectedControlColor.cgColor : CGColor.clear + viewLayer.borderColor = .albumBorderColorLight + boxLayer.borderColor = isSelected ? NSColor.selectedControlColor.cgColor : CGColor.clear + boxLayer.backgroundColor = albumCoverBox.layer?.borderColor } }