From c5ed540194db51ba31c4787942dbf8cc826a9bd1 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 17 Feb 2018 17:45:05 -0800 Subject: [PATCH] Use CoalescingQueue.standard instead of one created by AppDelegate. --- Evergreen/AppDelegate.swift | 1 - Evergreen/DockBadge.swift | 2 +- Evergreen/MainWindow/MainWindowController.swift | 3 ++- Evergreen/MainWindow/Timeline/TimelineViewController.swift | 2 +- Evergreen/SmartFeeds/SmartFeed.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift index af61ab05b..a61486e9e 100644 --- a/Evergreen/AppDelegate.swift +++ b/Evergreen/AppDelegate.swift @@ -26,7 +26,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, var authorAvatarDownloader: AuthorAvatarDownloader! var feedIconDownloader: FeedIconDownloader! var appName: String! - var coalescingQueue = CoalescingQueue(name: "UI Queue", interval: 0.05) @IBOutlet var debugMenuItem: NSMenuItem! @IBOutlet var sortByOldestArticleOnTopMenuItem: NSMenuItem! diff --git a/Evergreen/DockBadge.swift b/Evergreen/DockBadge.swift index af3ea8ee0..c90ea6825 100644 --- a/Evergreen/DockBadge.swift +++ b/Evergreen/DockBadge.swift @@ -15,7 +15,7 @@ import RSCore func update() { - appDelegate?.coalescingQueue.add(self, #selector(updateBadge)) + CoalescingQueue.standard.add(self, #selector(updateBadge)) } @objc func updateBadge() { diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index 120480fdd..7a3281900 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -9,6 +9,7 @@ import AppKit import Data import Account +import RSCore private let kWindowFrameKey = "MainWindow" @@ -120,7 +121,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { @objc func refreshProgressDidChange(_ note: Notification) { - appDelegate?.coalescingQueue.add(self, #selector(makeToolbarValidate)) + CoalescingQueue.standard.add(self, #selector(makeToolbarValidate)) } @objc func unreadCountDidChange(_ note: Notification) { diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController.swift b/Evergreen/MainWindow/Timeline/TimelineViewController.swift index 5aa2ee86d..5d1d9a465 100644 --- a/Evergreen/MainWindow/Timeline/TimelineViewController.swift +++ b/Evergreen/MainWindow/Timeline/TimelineViewController.swift @@ -613,7 +613,7 @@ private extension TimelineViewController { func queueReloadAvailableCells() { - appDelegate.coalescingQueue.add(self, #selector(reloadAvailableCells)) + CoalescingQueue.standard.add(self, #selector(reloadAvailableCells)) } func updateTableViewRowHeight() { diff --git a/Evergreen/SmartFeeds/SmartFeed.swift b/Evergreen/SmartFeeds/SmartFeed.swift index 3bc012c37..c7bfa7623 100644 --- a/Evergreen/SmartFeeds/SmartFeed.swift +++ b/Evergreen/SmartFeeds/SmartFeed.swift @@ -74,7 +74,7 @@ private extension SmartFeed { func queueFetchUnreadCounts() { - appDelegate?.coalescingQueue.add(self, #selector(fetchUnreadCounts)) + CoalescingQueue.standard.add(self, #selector(fetchUnreadCounts)) } func fetchUnreadCount(for account: Account) {