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

Merge branch 'mark-as-read-on-scroll' into super-cut

Browse Source
This commit is contained in:
Maurice Parker
2023-03-13 15:21:44 -05:00
parent e161bcf0e8 b019ee49a7
commit 7bf0b53975
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/MainWindow/Timeline/TimelineViewController.swift
View File

@@ -339,12 +339,8 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
@objc func openArticleInBrowser(_ sender: Any?) {
let urlStrings = selectedArticles.compactMap { $0.preferredLink }
Browser.open(urlStrings, fromWindow: self.view.window, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false)
if let link = oneSelectedArticle?.preferredLink {
Browser.open(link, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false)
}
}
@objc func scrollViewDidScroll(notification: Notification) {
markAsReadOnScroll()
}

11
Shared/Timeline/ArticleArray.swift
View File

@@ -103,17 +103,6 @@ extension Array where Element == Article {
return true
}
func articlesBetween(upperArticle: Article, lowerArticle: Article) -> [Article] {
guard let upperPosition = firstIndex(of: upperArticle), let lowerPosition = firstIndex(of: lowerArticle) else { return [] }
return articlesBetween(upperPosition: upperPosition, lowerPosition: lowerPosition)
}
func articlesBetween(upperPosition: Int, lowerPosition: Int) -> [Article] {
guard upperPosition < count, lowerPosition < count, upperPosition <= lowerPosition else { return [] }
let articlesAbove = self[upperPosition...lowerPosition]
return Array(articlesAbove)
}
func articlesAbove(article: Article) -> [Article] {
guard let position = firstIndex(of: article) else { return [] }
return articlesAbove(position: position)