FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make super minor edits.

Browse Source
This commit is contained in:
Brent Simmons 2017-10-05 20:03:35 -07:00
parent 119a03e891
commit b53626fc84
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Evergreen.xcodeproj/project.pbxproj
View File

@ -1164,6 +1164,7 @@
849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */, 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */,
84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */, 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */,
842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */, 842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */,
84DAEE321F870B390058304B /* DockBadge.swift in Sources */,
842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */, 842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */,
842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */, 842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */,
849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */, 849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */,
@ -1181,7 +1182,6 @@
849A97791ED9EC04007D329B /* TimelineStringUtilities.swift in Sources */, 849A97791ED9EC04007D329B /* TimelineStringUtilities.swift in Sources */,
849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */, 849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */,
849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */,
84DAEE321F870B390058304B /* DockBadge.swift in Sources */,
849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */, 849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */,
849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */, 849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */,
849A97921ED9EF65007D329B /* IndeterminateProgressWindowController.swift in Sources */, 849A97921ED9EF65007D329B /* IndeterminateProgressWindowController.swift in Sources */,

18
Evergreen/MainWindow/MainWindowController.swift
View File

@ -21,7 +21,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
super.windowDidLoad() super.windowDidLoad()
// window?.titleVisibility = .hidden
window?.setFrameUsingName(windowAutosaveName, force: true) window?.setFrameUsingName(windowAutosaveName, force: true)
detailSplitViewItem?.minimumThickness = 384 detailSplitViewItem?.minimumThickness = 384
@ -54,12 +53,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
@objc func refreshProgressDidChange(_ note: Notification) { @objc func refreshProgressDidChange(_ note: Notification) {
rs_performSelectorCoalesced(#selector(MainWindowController.coalescedMakeToolbarValidate(_:)), with: nil, afterDelay: 0.1) rs_performSelectorCoalesced(#selector(MainWindowController.makeToolbarValidate(_:)), with: nil, afterDelay: 0.1)
} }
// MARK: Toolbar // MARK: Toolbar
@objc func coalescedMakeToolbarValidate(_ sender: Any) { @objc func makeToolbarValidate(_ sender: Any) {
window?.toolbar?.validateVisibleItems() window?.toolbar?.validateVisibleItems()
} }
@ -123,6 +122,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
} }
} }
// MARK: - Private
private extension MainWindowController { private extension MainWindowController {
var splitViewController: NSSplitViewController? { var splitViewController: NSSplitViewController? {
@ -147,12 +148,12 @@ private extension MainWindowController {
} }
var detailSplitViewItem: NSSplitViewItem? { var detailSplitViewItem: NSSplitViewItem? {
get {
return splitViewController?.splitViewItems[2] return splitViewController?.splitViewItems[2]
}
} }
var detailViewController: DetailViewController? { var detailViewController: DetailViewController? {
get { get {
return splitViewController?.splitViewItems[2].viewController as? DetailViewController return splitViewController?.splitViewItems[2].viewController as? DetailViewController
} }
@ -175,10 +176,7 @@ private extension MainWindowController {
var currentLink: String? { var currentLink: String? {
get { get {
if let article = oneSelectedArticle { return oneSelectedArticle?.preferredLink
return article.preferredLink
}
return nil
} }
} }