Merge pull request MortimerGoro#261 from dmsl1805/master

MGSwipeExpansionLayoutNone added.
coderChrisLee · Mar 19, 2017 · d93720b · d93720b
2 parents 2f03dde + 30c8e1c
commit d93720b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/MGSwipeTableCell/MGSwipeTableCell.h b/MGSwipeTableCell/MGSwipeTableCell.h
@@ -39,7 +39,8 @@ typedef NS_ENUM(NSInteger, MGSwipeState) {
 /** Swipe state */
 typedef NS_ENUM(NSInteger, MGSwipeExpansionLayout) {
     MGSwipeExpansionLayoutBorder = 0,
-    MGSwipeExpansionLayoutCenter
+    MGSwipeExpansionLayoutCenter,
+    MGSwipeExpansionLayoutNone
 };
 
 /** Swipe Easing Function */

diff --git a/MGSwipeTableCell/MGSwipeTableCell.m b/MGSwipeTableCell/MGSwipeTableCell.m
@@ -204,16 +204,22 @@ -(void) expandToOffset:(CGFloat) offset settings:(MGSwipeExpansionSettings*) set
                 _expandedButton.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
                 [_expandedButton.superview bringSubviewToFront:_expandedButton];
                 _expandedButton.frame = _container.bounds;
+                _expansionBackground.frame = [self expansionBackgroundRect:_expandedButton];
+            }
+            else if (_expansionLayout == MGSwipeExpansionLayoutNone) {
+                [_expandedButton.superview bringSubviewToFront:_expandedButton];
+                _expansionBackground.frame = _container.bounds;
             }
             else if (_fromLeft) {
                 _expandedButton.frame = CGRectMake(_container.bounds.size.width - _expandedButton.bounds.size.width, 0, _expandedButton.bounds.size.width, _expandedButton.bounds.size.height);
                 _expandedButton.autoresizingMask|= UIViewAutoresizingFlexibleLeftMargin;
+                _expansionBackground.frame = [self expansionBackgroundRect:_expandedButton];
             }
             else {
                 _expandedButton.frame = CGRectMake(0, 0, _expandedButton.bounds.size.width, _expandedButton.bounds.size.height);
                 _expandedButton.autoresizingMask|= UIViewAutoresizingFlexibleRightMargin;
+                _expansionBackground.frame = [self expansionBackgroundRect:_expandedButton];
             }
-            _expansionBackground.frame = [self expansionBackgroundRect:_expandedButton];
 
         } completion:^(BOOL finished) {
         }];