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

Continue rewiring progress.

Browse Source
This commit is contained in:
Brent Simmons
2019-02-17 22:00:04 -08:00
parent 80761b4a83
commit 076df956f9
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
NetNewsWire/MainWindow/MainWindowController.swift
View File

@@ -38,6 +38,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
private static var detailViewMinimumThickness = 384
private var sidebarViewController: SidebarViewController!
private var timelineContainerViewController: TimelineContainerViewController!
private var detailViewController: DetailViewController!
// MARK: - NSWindowController
@@ -72,6 +73,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
timelineContainerViewController = splitViewController?.splitViewItems[1].viewController as? TimelineContainerViewController
timelineContainerViewController.delegate = self
detailViewController = splitViewController?.splitViewItems[2].viewController as? DetailViewController
NotificationCenter.default.addObserver(self, selector: #selector(applicationWillTerminate(_:)), name: NSApplication.willTerminateNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(refreshProgressDidChange(_:)), name: .AccountRefreshDidBegin, object: nil)
@@ -208,13 +211,9 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
@IBAction func scrollOrGoToNextUnread(_ sender: Any?) {
guard let detailViewController = detailViewController else {
return
}
detailViewController.canScrollDown { (canScroll) in
NSCursor.setHiddenUntilMouseMoves(true)
canScroll ? detailViewController.scrollPageDown(sender) : self.nextUnread(sender)
canScroll ? self.detailViewController.scrollPageDown(sender) : self.nextUnread(sender)
}
}
@@ -439,10 +438,6 @@ private extension MainWindowController {
return splitViewController?.splitViewItems[2]
}
var detailViewController: DetailViewController? {
return splitViewController?.splitViewItems[2].viewController as? DetailViewController
}
var selectedArticles: [Article]? {
return timelineViewController?.selectedArticles
}