Preventing _adjustContentOffsetIfNecessary from triggering.

stefanceriu · Jun 1, 2016 · cb99128 · cb99128
1 parent 3f4ea68
commit cb99128
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/SCStackViewController.podspec b/SCStackViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'SCStackViewController'
-  s.version  = '3.3.2'
+  s.version  = '3.3.3'
   s.platform = :ios
   s.ios.deployment_target = '5.0'
 

diff --git a/SCStackViewController/SCStackViewController.m b/SCStackViewController/SCStackViewController.m
@@ -86,7 +86,7 @@ - (void)setup
 	self.navigationContaintType = SCStackViewControllerNavigationContraintTypeForward | SCStackViewControllerNavigationContraintTypeReverse;
 
 	self.scrollView = [[SCScrollView alloc] init];
-	[self.scrollView setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+	[self.scrollView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
 	[self.scrollView setDirectionalLockEnabled:YES];
 	[self.scrollView setDecelerationRate:UIScrollViewDecelerationRateFast];
 	[self.scrollView setDelegate:self];
@@ -504,15 +504,21 @@ - (void)viewDidLoad
 {
 	[super viewDidLoad];
 
-	[self.view setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+    [self.view setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
 
 	[self.rootViewController willMoveToParentViewController:self];
 	[self.scrollView addSubview:self.rootViewController.view];
 	[self addChildViewController:self.rootViewController];
 	[self.rootViewController didMoveToParentViewController:self];
 
 	[self.scrollView setFrame:self.view.bounds];
-	[self.view addSubview:self.scrollView];
+
+    // Prevents _adjustContentOffsetIfNecessary from triggering
+    UIView *scrollViewWrapper = [[UIView alloc] initWithFrame:self.view.bounds];
+    [scrollViewWrapper setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+    [scrollViewWrapper addSubview:self.scrollView];
+
+	[self.view addSubview:scrollViewWrapper];
 }
 
 - (void)viewWillLayoutSubviews