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

Do not mark as read without user interaction

Browse Source
This commit is contained in:
everhardt 2021-10-30 18:57:04 +02:00
parent 8e53768033
commit 96ffa3aa22
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,8 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
var articlesWithManuallyChangedReadStatus: Set<Article> = Set() var articlesWithManuallyChangedReadStatus: Set<Article> = Set()
private var isScrolling = false
private var fetchSerialNumber = 0 private var fetchSerialNumber = 0
private let fetchRequestQueue = FetchRequestQueue() private let fetchRequestQueue = FetchRequestQueue()
private var exceptionArticleFetcher: ArticleFetcher? private var exceptionArticleFetcher: ArticleFetcher?
@ -235,6 +237,10 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
scrollView.contentView.postsBoundsChangedNotifications = true scrollView.contentView.postsBoundsChangedNotifications = true
NotificationCenter.default.addObserver(self, selector: #selector(scrollViewDidScroll(notification:)), name: NSView.boundsDidChangeNotification, object: scrollView.contentView) NotificationCenter.default.addObserver(self, selector: #selector(scrollViewDidScroll(notification:)), name: NSView.boundsDidChangeNotification, object: scrollView.contentView)
NotificationCenter.default.addObserver(self, selector: #selector(scrollViewWillStartLiveScroll(notification:)), name: NSScrollView.willStartLiveScrollNotification, object: scrollView)
NotificationCenter.default.addObserver(self, selector: #selector(scrollViewDidEndLiveScroll(notification:)), name: NSScrollView.didEndLiveScrollNotification, object: scrollView)
} }
didRegisterForNotifications = true didRegisterForNotifications = true
@ -341,8 +347,18 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
} }
@objc func scrollViewDidScroll(notification: Notification){ @objc func scrollViewDidScroll(notification: Notification){
if isScrolling {
scrollPositionQueue.add(self, #selector(scrollPositionDidChange)) scrollPositionQueue.add(self, #selector(scrollPositionDidChange))
} }
}
@objc func scrollViewWillStartLiveScroll(notification: Notification){
isScrolling = true
}
@objc func scrollViewDidEndLiveScroll(notification: Notification){
isScrolling = false
}
@objc func scrollPositionDidChange(){ @objc func scrollPositionDidChange(){
if !AppDefaults.shared.markArticlesAsReadOnScroll { if !AppDefaults.shared.markArticlesAsReadOnScroll {

2
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -418,8 +418,10 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
} }
override func scrollViewDidScroll(_ scrollView: UIScrollView) { override func scrollViewDidScroll(_ scrollView: UIScrollView) {
if scrollView.isTracking {
scrollPositionQueue.add(self, #selector(scrollPositionDidChange)) scrollPositionQueue.add(self, #selector(scrollPositionDidChange))
} }
}
// MARK: Notifications // MARK: Notifications