Merge pull request robotmedia#4 from miumi-u/master

Fixes robotmedia#1.
xjki · Jun 8, 2014 · f358acf · f358acf
2 parents c25d913 + 896a5c2
commit f358acf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/RMGallery/RMGalleryView.m b/RMGallery/RMGalleryView.m
@@ -204,6 +204,9 @@ -(void)scrollViewWillEndDragging:(UIScrollView*)scrollView withVelocity:(CGPoint
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
+    if (!self.scrollEnabled) {
+        return;
+    }
     const NSUInteger index = [_imageFlowLayout indexForOffset:scrollView.contentOffset];
     if (index != _galleryIndex)
     {

diff --git a/RMGallery/RMGalleryViewController.m b/RMGallery/RMGalleryViewController.m
@@ -83,6 +83,17 @@ - (void)viewWillAppear:(BOOL)animated
     }
 }
 
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
+                                duration:(NSTimeInterval)duration
+{
+    _galleryView.scrollEnabled = NO;
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromOrientation
+{
+    _galleryView.scrollEnabled = YES;
+}
+
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
     [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];