Merge pull request CEWendel#50 from mergesort/scroll_enabled

CEWendel · CEWendel · commit 2f31df0f11e2 · 2013-12-18T13:32:19.000-08:00
Replace scrollEnabled = YES and NO by turning on directionLockEnabled on the tableView
diff --git a/SWTableViewCell/PodFiles/SWTableViewCell.m b/SWTableViewCell/PodFiles/SWTableViewCell.m
@@ -137,6 +137,8 @@ - (void)initializer
     {
         [self.scrollViewContentView addSubview:subview];
     }
+    
+    self.containingTableView.directionalLockEnabled = YES;
 }
 
 - (void)layoutSubviews
@@ -152,7 +154,6 @@ - (void)layoutSubviews
     self.scrollViewButtonViewRight.layer.masksToBounds = YES;
     self.scrollViewContentView.frame = CGRectMake([self leftUtilityButtonsWidth], 0, CGRectGetWidth(self.bounds), self.height);
     self.cellScrollView.scrollEnabled = YES;
-    self.containingTableView.scrollEnabled = YES;
     self.tapGestureRecognizer.enabled = YES;
 }
 
@@ -531,33 +532,36 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
-    self.containingTableView.scrollEnabled = NO;
     self.tapGestureRecognizer.enabled = NO;
     if (scrollView.contentOffset.x > [self leftUtilityButtonsWidth])
     {
-        CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self rightUtilityButtonsWidth]);
-        
-        // Expose the right button view
-        self.scrollViewButtonViewRight.frame = CGRectMake(scrollView.contentOffset.x + (CGRectGetWidth(self.bounds) - scrollViewWidth), 0.0f, scrollViewWidth,self.height);
-        
-        CGRect scrollViewBounds = self.scrollViewButtonViewRight.bounds;
-        scrollViewBounds.origin.x = MAX([self rightUtilityButtonsWidth] - scrollViewWidth, [self rightUtilityButtonsWidth] - scrollView.contentOffset.x);
-        self.scrollViewButtonViewRight.bounds = scrollViewBounds;
+        if ([self rightUtilityButtonsWidth] > 0)
+        {
+            CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self rightUtilityButtonsWidth]);
+            
+            // Expose the right button view
+            self.scrollViewButtonViewRight.frame = CGRectMake(scrollView.contentOffset.x + (CGRectGetWidth(self.bounds) - scrollViewWidth), 0.0f, scrollViewWidth,self.height);
+            
+            CGRect scrollViewBounds = self.scrollViewButtonViewRight.bounds;
+            scrollViewBounds.origin.x = MAX([self rightUtilityButtonsWidth] - scrollViewWidth, [self rightUtilityButtonsWidth] - scrollView.contentOffset.x);
+            self.scrollViewButtonViewRight.bounds = scrollViewBounds;
+        }
     }
     else
     {
-        CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self leftUtilityButtonsWidth]);
-        
         // Expose the left button view
-        self.scrollViewButtonViewLeft.frame = CGRectMake([self leftUtilityButtonsWidth], 0.0f, scrollViewWidth, self.height);
-        
+        if ([self leftUtilityButtonsWidth] > 0)
+        {
+            CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self leftUtilityButtonsWidth]);
+            
+            self.scrollViewButtonViewLeft.frame = CGRectMake([self leftUtilityButtonsWidth], 0.0f, scrollViewWidth, self.height);
+        }
     }
 }
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
     self.tapGestureRecognizer.enabled = YES;
-    self.containingTableView.scrollEnabled = YES;
 }
 
 - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
@@ -566,7 +570,6 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
     self.tapGestureRecognizer.enabled = YES;
     if (_cellState == kCellStateCenter)
     {
-        self.containingTableView.scrollEnabled = YES;
         self.longPressGestureRecognizer.enabled = YES;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ - (void)initializer`
`137`	`137`	`{`
`138`	`138`	`[self.scrollViewContentView addSubview:subview];`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+ self.containingTableView.directionalLockEnabled = YES;`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`- (void)layoutSubviews`
`@@ -152,7 +154,6 @@ - (void)layoutSubviews`
`152`	`154`	`self.scrollViewButtonViewRight.layer.masksToBounds = YES;`
`153`	`155`	`self.scrollViewContentView.frame = CGRectMake([self leftUtilityButtonsWidth], 0, CGRectGetWidth(self.bounds), self.height);`
`154`	`156`	`self.cellScrollView.scrollEnabled = YES;`
`155`		`- self.containingTableView.scrollEnabled = YES;`
`156`	`157`	`self.tapGestureRecognizer.enabled = YES;`
`157`	`158`	`}`
`158`	`159`
`@@ -531,33 +532,36 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi`
`531`	`532`
`532`	`533`	`- (void)scrollViewDidScroll:(UIScrollView *)scrollView`
`533`	`534`	`{`
`534`		`- self.containingTableView.scrollEnabled = NO;`
`535`	`535`	`self.tapGestureRecognizer.enabled = NO;`
`536`	`536`	`if (scrollView.contentOffset.x > [self leftUtilityButtonsWidth])`
`537`	`537`	`{`
`538`		`- CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self rightUtilityButtonsWidth]);`
`539`		`-`
`540`		`- // Expose the right button view`
`541`		`- self.scrollViewButtonViewRight.frame = CGRectMake(scrollView.contentOffset.x + (CGRectGetWidth(self.bounds) - scrollViewWidth), 0.0f, scrollViewWidth,self.height);`
`542`		`-`
`543`		`- CGRect scrollViewBounds = self.scrollViewButtonViewRight.bounds;`
`544`		`- scrollViewBounds.origin.x = MAX([self rightUtilityButtonsWidth] - scrollViewWidth, [self rightUtilityButtonsWidth] - scrollView.contentOffset.x);`
`545`		`- self.scrollViewButtonViewRight.bounds = scrollViewBounds;`
	`538`	`+ if ([self rightUtilityButtonsWidth] > 0)`
	`539`	`+ {`
	`540`	`+ CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self rightUtilityButtonsWidth]);`
	`541`	`+`
	`542`	`+ // Expose the right button view`
	`543`	`+ self.scrollViewButtonViewRight.frame = CGRectMake(scrollView.contentOffset.x + (CGRectGetWidth(self.bounds) - scrollViewWidth), 0.0f, scrollViewWidth,self.height);`
	`544`	`+`
	`545`	`+ CGRect scrollViewBounds = self.scrollViewButtonViewRight.bounds;`
	`546`	`+ scrollViewBounds.origin.x = MAX([self rightUtilityButtonsWidth] - scrollViewWidth, [self rightUtilityButtonsWidth] - scrollView.contentOffset.x);`
	`547`	`+ self.scrollViewButtonViewRight.bounds = scrollViewBounds;`
	`548`	`+ }`
`546`	`549`	`}`
`547`	`550`	`else`
`548`	`551`	`{`
`549`		`- CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self leftUtilityButtonsWidth]);`
`550`		`-`
`551`	`552`	`// Expose the left button view`
`552`		`- self.scrollViewButtonViewLeft.frame = CGRectMake([self leftUtilityButtonsWidth], 0.0f, scrollViewWidth, self.height);`
`553`		`-`
	`553`	`+ if ([self leftUtilityButtonsWidth] > 0)`
	`554`	`+ {`
	`555`	`+ CGFloat scrollViewWidth = MIN(scrollView.contentOffset.x - [self leftUtilityButtonsWidth], [self leftUtilityButtonsWidth]);`
	`556`	`+`
	`557`	`+ self.scrollViewButtonViewLeft.frame = CGRectMake([self leftUtilityButtonsWidth], 0.0f, scrollViewWidth, self.height);`
	`558`	`+ }`
`554`	`559`	`}`
`555`	`560`	`}`
`556`	`561`
`557`	`562`	`- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView`
`558`	`563`	`{`
`559`	`564`	`self.tapGestureRecognizer.enabled = YES;`
`560`		`- self.containingTableView.scrollEnabled = YES;`
`561`	`565`	`}`
`562`	`566`
`563`	`567`	`- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView`
`@@ -566,7 +570,6 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView`
`566`	`570`	`self.tapGestureRecognizer.enabled = YES;`
`567`	`571`	`if (_cellState == kCellStateCenter)`
`568`	`572`	`{`
`569`		`- self.containingTableView.scrollEnabled = YES;`
`570`	`573`	`self.longPressGestureRecognizer.enabled = YES;`
`571`	`574`	`}`
`572`	`575`	`}`