Updated examples to support the new animation directions (top left, b…

…ottom left, top right, bottom right)
neror · Oct 13, 2010 · 694c192 · 694c192
1 parent 30231a8
commit 694c192
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Examples/BackInOut.m b/Examples/BackInOut.m
@@ -37,11 +37,9 @@ - (void)viewDidLoad {
 
 - (void)performAnimation:(id)sender {
   if(self.viewToAnimate.hidden) {
-	  //[self.viewToAnimate backInFrom:self.directionControl.selectedSegmentIndex+4 withFade:NO duration:.4 delegate:nil];
-	  [self.viewToAnimate backInFrom:self.directionControl.selectedSegmentIndex+4 inView:self.viewToAnimate.superview withFade:NO duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
+	  [self.viewToAnimate backInFrom:self.directionControl.selectedSegmentIndex inView:self.viewToAnimate.superview withFade:NO duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
   } else {
-	  //[self.viewToAnimate backOutTo:self.directionControl.selectedSegmentIndex+4 withFade:NO duration:.4 delegate:nil];
-	  [self.viewToAnimate backOutTo:self.directionControl.selectedSegmentIndex+4 inView:self.viewToAnimate.superview withFade:NO duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
+	  [self.viewToAnimate backOutTo:self.directionControl.selectedSegmentIndex inView:self.viewToAnimate.superview withFade:NO duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
 
   }
 }

diff --git a/Examples/SimpleAnimationExample.m b/Examples/SimpleAnimationExample.m
@@ -79,7 +79,7 @@ - (void)loadView {
   [self.performAnimationButton setTitle:@"Run Animation" forState:UIControlStateNormal];
   [self.performAnimationButton addTarget:self action:@selector(performAnimation:) forControlEvents:UIControlEventTouchUpInside];
 
-  NSArray *directionItems = [NSArray arrayWithObjects:@"Top", @"Right", @"Bottom", @"Left", nil];
+  NSArray *directionItems = [NSArray arrayWithObjects:@"T", @"R", @"B", @"L", @"TL", @"TR", @"BL", @"BR", nil];
   self.directionControl = [[[UISegmentedControl alloc] initWithItems:directionItems] autorelease];
   self.directionControl.selectedSegmentIndex = 0;
   self.directionControl.frame = CGRectMake(10., 300., 300., 44.);

diff --git a/Examples/SlideInOut.m b/Examples/SlideInOut.m
@@ -38,11 +38,9 @@ - (void)viewDidLoad {
 
 - (void)performAnimation:(id)sender {
   if(self.viewToAnimate.hidden) {
-	  //[self.viewToAnimate slideInFrom:self.directionControl.selectedSegmentIndex duration:.4 delegate:nil];
-	  [self.viewToAnimate slideInFrom:self.directionControl.selectedSegmentIndex+4 inView:self.viewToAnimate.superview duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
+	  [self.viewToAnimate slideInFrom:self.directionControl.selectedSegmentIndex inView:self.viewToAnimate.superview duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
   } else {
-	  //[self.viewToAnimate slideOutTo:self.directionControl.selectedSegmentIndex duration:.4 delegate:nil];
-	  [self.viewToAnimate slideOutTo:self.directionControl.selectedSegmentIndex+4 inView:self.viewToAnimate.superview duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
+	  [self.viewToAnimate slideOutTo:self.directionControl.selectedSegmentIndex inView:self.viewToAnimate.superview duration:0.4 delegate:nil startSelector:nil stopSelector:nil];
 
   }
 }