Merge branch 'ios-release'

This commit is contained in:
Maurice Parker
2020-06-15 17:40:06 -05:00
12 changed files with 173 additions and 71 deletions

View File

@@ -129,8 +129,9 @@ class WebViewController: UIViewController {
func scrollPageDown() {
guard let webView = webView else { return }
let overlap = 2 * UIFont.systemFont(ofSize: UIFont.systemFontSize).lineHeight * UIScreen.main.scale
let scrollToY: CGFloat = {
let fullScroll = webView.scrollView.contentOffset.y + webView.scrollView.layoutMarginsGuide.layoutFrame.height
let fullScroll = webView.scrollView.contentOffset.y + webView.scrollView.layoutMarginsGuide.layoutFrame.height - overlap
let final = finalScrollPosition()
return fullScroll < final ? fullScroll : final
}()