From 0ee16d1e53fa5ae36b0bfc5cf407bdfaa9f63d7c Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 10 Apr 2018 10:56:56 +0800 Subject: [PATCH] fix contentinset bug --- PullToRefresh/PullToRefresh.swift | 5 ++--- PullToRefreshDemo/ViewController.swift | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PullToRefresh/PullToRefresh.swift b/PullToRefresh/PullToRefresh.swift index ac7fe1c..93c76ad 100644 --- a/PullToRefresh/PullToRefresh.swift +++ b/PullToRefresh/PullToRefresh.swift @@ -145,7 +145,7 @@ extension PullToRefresh { var offset: CGFloat switch position { case .top: - offset = previousScrollViewOffset.y + scrollViewDefaultInsets.top + offset = previousScrollViewOffset.y case .bottom: if scrollView!.contentSize.height > scrollView!.bounds.height { @@ -272,7 +272,6 @@ private extension PullToRefresh { return } - scrollView.contentOffset = previousScrollViewOffset scrollView.bounces = false UIView.animate( withDuration: 0.3, @@ -322,7 +321,7 @@ private extension PullToRefresh { var isCurrentlyVisible: Bool { guard let scrollView = scrollView else { return false } - return scrollView.normalizedContentOffset.y <= -scrollViewDefaultInsets.top + return scrollView.normalizedContentOffset.y <= 0 } func bringRefreshViewToSuperview() { diff --git a/PullToRefreshDemo/ViewController.swift b/PullToRefreshDemo/ViewController.swift index a0e2dd6..2eb8d8e 100644 --- a/PullToRefreshDemo/ViewController.swift +++ b/PullToRefreshDemo/ViewController.swift @@ -18,7 +18,7 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - + tableView.contentInset = UIEdgeInsets(top: 100, left: 0, bottom: 0, right: 0) setupPullToRefresh() }