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

Maintain scroll position when changing themes

Browse Source
This commit is contained in:
Maurice Parker
2021-09-11 20:53:57 -05:00
parent baad458138
commit abd66ea1bb
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Mac/MainWindow/Detail/DetailWebViewController.swift
View File

@@ -55,6 +55,7 @@ final class DetailWebViewController: NSViewController {
private let detailIconSchemeHandler = DetailIconSchemeHandler()
private var waitingForFirstReload = false
private var windowScrollY: CGFloat?
private let keyboardDelegate = DetailKeyboardDelegate()
private struct MessageName {
@@ -143,7 +144,10 @@ final class DetailWebViewController: NSViewController {
}
@objc func currentArticleThemeDidChangeNotification(_ note: Notification) {
reloadHTML()
fetchScrollInfo() { scrollInfo in
self.windowScrollY = scrollInfo?.offsetY
self.reloadHTML()
}
}
// MARK: Media Functions
@@ -226,6 +230,11 @@ extension DetailWebViewController: WKNavigationDelegate, WKUIDelegate {
webView.isHidden = false
}
}
if let windowScrollY = windowScrollY {
webView.evaluateJavaScript("window.scrollTo(0, \(windowScrollY));")
self.windowScrollY = nil
}
}
// WKUIDelegate