Persephone/Controllers/AlbumViewController.swift

@@ -44,15 +44,6 @@ class AlbumViewController: NSViewController,
     albumCollectionView.collectionViewLayout?.invalidateLayout()
   }
 
-  override func viewDidLayout() {
-    super.viewDidLayout()
-
-    guard let layout = albumCollectionView.collectionViewLayout as? AlbumViewLayout
-      else { return }
-
-    layout.setScrollPosition()
-  }
-
   @objc func updateAlbums(_ notification: Notification) {
     guard let albums = notification.userInfo?[Notification.albumsKey] as? [MPDClient.Album]
       else { return }

Persephone/Layouts/AlbumViewLayout.swift

@@ -11,7 +11,6 @@ import Cocoa
 class AlbumViewLayout: NSCollectionViewFlowLayout {
   let maxItemWidth: CGFloat = 180
   let albumInfoHeight: CGFloat = 39
-  var scrollPosition: CGFloat = 0
 
   required init?(coder aDecoder: NSCoder) {
     super.init()
@@ -36,10 +35,6 @@ class AlbumViewLayout: NSCollectionViewFlowLayout {
     var divider: CGFloat = 1
     var itemWidth: CGFloat = 0
 
-    if let scrollView = collectionView.enclosingScrollView {
-      scrollPosition = scrollView.documentVisibleRect.minY / collectionView.bounds.height
-    }
-
     repeat {
       let totalPaddingWidth = sectionInset.left + sectionInset.right
       let totalGutterWidth = (divider - 1) * (minimumInteritemSpacing)
@@ -51,11 +46,4 @@ class AlbumViewLayout: NSCollectionViewFlowLayout {
 
     itemSize = NSSize(width: itemWidth, height: itemHeight)
   }
-
-  func setScrollPosition() {
-    guard let collectionView = collectionView
-      else { return }
-
-    collectionView.scroll(NSPoint(x: 0, y: scrollPosition * collectionView.bounds.height))
-  }
 }

Persephone/Views/AlbumItemView.swift

@@ -43,7 +43,7 @@ class AlbumItemView: NSView {
 
     NotificationCenter.default.addObserver(
       self,
-      selector: #selector(viewDidScroll(_:)),
+      selector: #selector(viewWillScroll(_:)),
       name: NSScrollView.didLiveScrollNotification,
       object: nil
     )
@@ -59,10 +59,6 @@ class AlbumItemView: NSView {
     hidePlayButton()
   }
 
-  @objc func viewDidScroll(_ notification: Notification) {
-    hidePlayButton()
-  }
-
   override func resize(withOldSuperviewSize oldSize: NSSize) {
     hidePlayButton()
   }