From 050dd932ab20566e4e636a91129cfb7c83349880 Mon Sep 17 00:00:00 2001 From: Maxim Khatskevich Date: Sun, 2 Feb 2014 11:14:33 +0600 Subject: [PATCH] Minor bug fix in ZoomIn and ZoomOut animation from Del. --- CanvasLibrary/CSAnimation.m | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CanvasLibrary/CSAnimation.m b/CanvasLibrary/CSAnimation.m index ecc03a3..8e70b25 100644 --- a/CanvasLibrary/CSAnimation.m +++ b/CanvasLibrary/CSAnimation.m @@ -482,17 +482,18 @@ @implementation CSZoomIn + (void)load { [self registerClass:self forAnimationType:CSAnimationTypeZoomIn]; } +//DEL THINKS THESE 2 ANIMATIONS (ZOOM IN AND ZOOM OUT) ARE BACKWARDS! + (void)performAnimationOnView:(UIView *)view duration:(NSTimeInterval)duration delay:(NSTimeInterval)delay { // Start - view.transform = CGAffineTransformMakeScale(1, 1); - view.alpha = 1; + view.transform = CGAffineTransformMakeScale(2, 2); + view.alpha = 0; [UIView animateKeyframesWithDuration:duration delay:delay options:0 animations:^{ // End - view.transform = CGAffineTransformMakeScale(2, 2); - view.alpha = 0; + view.transform = CGAffineTransformMakeScale(1, 1); + view.alpha = 1; } completion:^(BOOL finished) { -// view.transform = CGAffineTransformMakeScale(1, 1); -// view.alpha = 1; + // view.transform = CGAffineTransformMakeScale(1, 1); + // view.alpha = 1; }]; } @end @@ -505,13 +506,14 @@ + (void)load { } + (void)performAnimationOnView:(UIView *)view duration:(NSTimeInterval)duration delay:(NSTimeInterval)delay { // Start - view.transform = CGAffineTransformMakeScale(2, 2); - view.alpha = 0; + view.transform = CGAffineTransformMakeScale(1, 1); + view.alpha = 1; [UIView animateKeyframesWithDuration:duration delay:delay options:0 animations:^{ // End - view.transform = CGAffineTransformMakeScale(1, 1); - view.alpha = 1; + view.transform = CGAffineTransformMakeScale(2, 2); + view.alpha = 0; } completion:^(BOOL finished) { + view.transform = CGAffineTransformMakeScale(1, 1); }]; } @end