Merge pull request #272 from pbtura/master

Fix for issue #264

Author: CEWendel

SWTableViewCell/PodFiles/SWTableViewCell.m

@@ -45,6 +45,7 @@ - (BOOL)shouldHighlight;
 
 @implementation SWTableViewCell {
     UIView *_contentCellView;
+    BOOL layoutUpdating;
 }
 
 #pragma mark Initializers
@@ -75,6 +76,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
 
 - (void)initializer
 {
+    layoutUpdating = NO;
     // Set up scroll view that will host our cell content
     self.cellScrollView = [[SWCellScrollView alloc] init];
     self.cellScrollView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -317,6 +319,7 @@ - (void)layoutSubviews
 
 - (void)setFrame:(CGRect)frame
 {
+    layoutUpdating = YES;
     // Fix for new screen sizes
     // Initially, the cell is still 320 points wide
     // We need to layout our subviews again when this changes so our constraints clip to the right width
@@ -325,7 +328,10 @@ - (void)setFrame:(CGRect)frame
     [super setFrame:frame];
 
     if (widthChanged)
+    {
         [self layoutIfNeeded];
+    }
+    layoutUpdating = NO;
 }
 
 - (void)prepareForReuse
@@ -575,59 +581,62 @@ - (CGPoint)contentOffsetForCellState:(SWCellState)state
 
 - (void)updateCellState
 {
-    // Update the cell state according to the current scroll view contentOffset.
-    for (NSNumber *numState in @[
-                                 @(kCellStateCenter),
-                                 @(kCellStateLeft),
-                                 @(kCellStateRight),
-                                 ])
+    if(layoutUpdating == NO)
     {
-        SWCellState cellState = numState.integerValue;
+        // Update the cell state according to the current scroll view contentOffset.
+        for (NSNumber *numState in @[
+                                     @(kCellStateCenter),
+                                     @(kCellStateLeft),
+                                     @(kCellStateRight),
+                                     ])
+        {
+            SWCellState cellState = numState.integerValue;
+            
+            if (CGPointEqualToPoint(self.cellScrollView.contentOffset, [self contentOffsetForCellState:cellState]))
+            {
+                _cellState = cellState;
+                break;
+            }
+        }
+        
+        // Update the clipping on the utility button views according to the current position.
+        CGRect frame = [self.contentView.superview convertRect:self.contentView.frame toView:self];
+        frame.size.width = CGRectGetWidth(self.frame);
+        
+        self.leftUtilityClipConstraint.constant = MAX(0, CGRectGetMinX(frame) - CGRectGetMinX(self.frame));
+        self.rightUtilityClipConstraint.constant = MIN(0, CGRectGetMaxX(frame) - CGRectGetMaxX(self.frame));
 
-        if (CGPointEqualToPoint(self.cellScrollView.contentOffset, [self contentOffsetForCellState:cellState]))
+        if (self.isEditing) {
+            self.leftUtilityClipConstraint.constant = 0;
+            self.cellScrollView.contentOffset = CGPointMake([self leftUtilityButtonsWidth], 0);
+            _cellState = kCellStateCenter;
+        }
+        
+        self.leftUtilityClipView.hidden = (self.leftUtilityClipConstraint.constant == 0);
+        self.rightUtilityClipView.hidden = (self.rightUtilityClipConstraint.constant == 0);
+        
+        if (self.accessoryType != UITableViewCellAccessoryNone && !self.editing) {
+            UIView *accessory = [self.cellScrollView.superview.subviews lastObject];
+            
+            CGRect accessoryFrame = accessory.frame;
+            accessoryFrame.origin.x = CGRectGetWidth(frame) - CGRectGetWidth(accessoryFrame) - kAccessoryTrailingSpace + CGRectGetMinX(frame);
+            accessory.frame = accessoryFrame;
+        }
+        
+        // Enable or disable the gesture recognizers according to the current mode.
+        if (!self.cellScrollView.isDragging && !self.cellScrollView.isDecelerating)
         {
-            _cellState = cellState;
-            break;
+            self.tapGestureRecognizer.enabled = YES;
+            self.longPressGestureRecognizer.enabled = (_cellState == kCellStateCenter);
+        }
+        else
+        {
+            self.tapGestureRecognizer.enabled = NO;
+            self.longPressGestureRecognizer.enabled = NO;
         }
-    }
-    
-    // Update the clipping on the utility button views according to the current position.
-    CGRect frame = [self.contentView.superview convertRect:self.contentView.frame toView:self];
-    frame.size.width = CGRectGetWidth(self.frame);
-    
-    self.leftUtilityClipConstraint.constant = MAX(0, CGRectGetMinX(frame) - CGRectGetMinX(self.frame));
-    self.rightUtilityClipConstraint.constant = MIN(0, CGRectGetMaxX(frame) - CGRectGetMaxX(self.frame));
-    
-    if (self.isEditing) {
-        self.leftUtilityClipConstraint.constant = 0;
-        self.cellScrollView.contentOffset = CGPointMake([self leftUtilityButtonsWidth], 0);
-        _cellState = kCellStateCenter;
-    }
-    
-    self.leftUtilityClipView.hidden = (self.leftUtilityClipConstraint.constant == 0);
-    self.rightUtilityClipView.hidden = (self.rightUtilityClipConstraint.constant == 0);
-    
-    if (self.accessoryType != UITableViewCellAccessoryNone && !self.editing) {
-        UIView *accessory = [self.cellScrollView.superview.subviews lastObject];
 
-        CGRect accessoryFrame = accessory.frame;
-        accessoryFrame.origin.x = CGRectGetWidth(frame) - CGRectGetWidth(accessoryFrame) - kAccessoryTrailingSpace + CGRectGetMinX(frame);
-        accessory.frame = accessoryFrame;
-    }
-    
-    // Enable or disable the gesture recognizers according to the current mode.
-    if (!self.cellScrollView.isDragging && !self.cellScrollView.isDecelerating)
-    {
-        self.tapGestureRecognizer.enabled = YES;
-        self.longPressGestureRecognizer.enabled = (_cellState == kCellStateCenter);
+        self.cellScrollView.scrollEnabled = !self.isEditing;
     }
-    else
-    {
-        self.tapGestureRecognizer.enabled = NO;
-        self.longPressGestureRecognizer.enabled = NO;
-    }
-    
-    self.cellScrollView.scrollEnabled = !self.isEditing;
 }
 
 #pragma mark - UIScrollViewDelegate

SWTableViewCell/ViewController.m

@@ -35,8 +35,7 @@ - (void)viewDidLoad {
     UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
     [refreshControl addTarget:self action:@selector(toggleCells:) forControlEvents:UIControlEventValueChanged];
     refreshControl.tintColor = [UIColor blueColor];
-    
-    [self.tableView addSubview:refreshControl];
+
     self.refreshControl = refreshControl;
 
     // If you set the seperator inset on iOS 6 you get a NSInvalidArgumentException...weird