Merge branch 'master' into bump-version-1.4

iZettle · Oct 27, 2018 · 3fa0116 · 3fa0116
2 parents 6c113f4 + 0f64c74
commit 3fa0116
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Added `UITextField` and `UIScrollView` `install()` delegate helpers.
 - Added remaining methods to `ScrollViewDelegete`.
 - Added `GestureRecognizerDelegate`.
+- Fixed a bug in `UIScrollView.adjustContentOffset` for scrollviews with a non-zero `frame.origin.y`.
 
 ## 1.3.3
 - Bugfix: Remove hardcoded value used for determing smallest resizable image size causing not smooth borders of rounded images

diff --git a/Form/UIScrollView+Keyboard.swift b/Form/UIScrollView+Keyboard.swift
@@ -164,9 +164,7 @@ private extension UIScrollView {
     func adjustContentOffset(_ adjustInsets: (UIView) -> UIEdgeInsets) {
         guard let firstResponder = firstResponder as? UIView else { return }
 
-        var bounds = frame // Can't use a scroll views bounds directly.
-        bounds.origin = .zero
-        let viewRect = UIEdgeInsetsInsetRect(bounds, contentInset)
+        let viewRect = UIEdgeInsetsInsetRect(frame, contentInset)
         let firstBounds = UIEdgeInsetsInsetRect(firstResponder.bounds, adjustInsets(firstResponder))
         let firstFrame = convert(firstBounds, from: firstResponder)