Fix issues with content insets for sites across OS versions.

2020-05-22 23:04:36 -04:00
parent e6ae06798b
commit d5d455ee57
2 changed files with 9 additions and 6 deletions
--- a/platform-darwin/Source/iOS/MPSitesViewController.m
+++ b/platform-darwin/Source/iOS/MPSitesViewController.m
@@ -120,12 +120,14 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
    PearlRemoveNotificationObservers();
 }

- (void)viewWillLayoutSubviews {
+- (void)viewDidLayoutSubviews {

-    self.collectionView.contentInset = [self.collectionView occludedInsets];
-    self.collectionView.scrollIndicatorInsets = self.collectionView.contentInset;
+    [super viewDidLayoutSubviews];

-    [super viewWillLayoutSubviews];
+    if (@available( iOS 11, * )) {
+        self.collectionView.layoutMargins =
+                UIEdgeInsetsMake( [self.collectionView occludedInsets].top - self.view.safeAreaInsets.top, 0, 0, 0 );
+    }
 }

 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {