replaces 0-delay animation blocks with more lightweight CATransaction.

Fixes invalid pragma's
WayneWeiZhang · Jan 12, 2012 · 22ec389 · 22ec389
1 parent a23c8f9
commit 22ec389
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/GMGridView/GMGridView.m b/GMGridView/GMGridView.m
@@ -280,6 +280,13 @@ - (void)dealloc
 #pragma mark Layout
 //////////////////////////////////////////////////////////////
 
+- (void)applyWithoutAnimation:(void (^)(void))animations {
+    [CATransaction begin];
+    [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
+    animations();
+    [CATransaction commit];
+}
+
 - (void)layoutSubviewsWithAnimation:(GMGridViewItemAnimation)animation
 {
     [self recomputeSizeAnimated:!(animation & GMGridViewItemAnimationNone)];
@@ -337,14 +344,9 @@ - (void)layoutSubviews
         transition.type = kCATransitionFade;
         [_scrollView.layer addAnimation:transition forKey:@"rotationAnimation"];
 
-        [UIView animateWithDuration:0 
-                              delay:0
-                            options:UIViewAnimationOptionOverrideInheritedDuration
-                         animations:^{
-                             [self layoutSubviewsWithAnimation:GMGridViewItemAnimationNone];
-                         }
-                         completion:nil
-         ];
+        [self applyWithoutAnimation:^{
+            [self layoutSubviewsWithAnimation:GMGridViewItemAnimationNone];
+        }];
     }
     else 
     {
@@ -1143,15 +1145,11 @@ - (GMGridViewCell *)newItemSubViewForPosition:(NSInteger)position
     CGRect frame = CGRectMake(origin.x, origin.y, _itemSize.width, _itemSize.height);
 
     // To make sure the frame is not animated
-    [UIView animateWithDuration:0 
-                          delay:0 
-                        options:kDefaultAnimationOptions | UIViewAnimationOptionOverrideInheritedDuration 
-                     animations:^{
-                         cell.frame = frame;
-                         cell.contentView.frame = cell.bounds;
-                     } 
-                     completion:nil];
-
+    [self applyWithoutAnimation:^{
+        cell.frame = frame;
+        cell.contentView.frame = cell.bounds;
+    }];
+
     cell.tag = position + kTagOffset;
     BOOL canEdit = self.editing && [self.dataSource GMGridView:self canDeleteItemAtIndex:position];
     [cell setEditing:canEdit animated:NO];