TIMOB-4137 We must delay rotating the status bar when returning from …

…a modal until after the modal animation is done.
gitizenme · Jun 22, 2011 · adcd74e · adcd74e
1 parent c6d728b
commit adcd74e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/iphone/Classes/TiApp.mm b/iphone/Classes/TiApp.mm
@@ -220,8 +220,7 @@ - (void)loadSplash
 	if (!loaded) {
 		[self attachSplash];
 	}
-	[window addSubview:controller.view];
-
+	[window setRootViewController:controller];
     [window makeKeyAndVisible];
 }
 

diff --git a/iphone/Classes/TiRootViewController.h b/iphone/Classes/TiRootViewController.h
@@ -22,6 +22,7 @@
 
 	UIInterfaceOrientation lastOrientation;
 	UIInterfaceOrientation windowOrientation;
+	BOOL ignoreRotations;
 
 	NSMutableArray * viewControllerStack;
 	BOOL isCurrentlyVisible;
@@ -65,4 +66,6 @@
 - (void)openWindow:(TiWindowProxy *)window withObject:(id)args;
 - (void)closeWindow:(TiWindowProxy *)window withObject:(id)args;
 
+-(UIInterfaceOrientation)mostRecentlyAllowedOrientation;
+
 @end
diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -199,14 +199,21 @@ - (void)viewWillDisappear:(BOOL)animated; // Called when the view is dismissed,
 
 - (void) viewDidAppear:(BOOL)animated
 {
+	ignoreRotations = NO;
 	[self.view becomeFirstResponder];
+	CGFloat duration = 0.0;
+	if (animated) {
+		duration = [[UIApplication sharedApplication] statusBarOrientationAnimationDuration];
+	}
+	[self manuallyRotateToOrientation:[self mostRecentlyAllowedOrientation] duration:duration];
     [super viewDidAppear:animated];
 	VerboseLog(@"%@%@",self,CODELOCATION);
 	[[viewControllerStack lastObject] viewDidAppear:animated];
 }
 
 - (void) viewDidDisappear:(BOOL)animated
 {
+	ignoreRotations = YES;
 	isCurrentlyVisible = NO;
 	[self.view resignFirstResponder];
     [super viewDidDisappear:animated];
@@ -238,19 +245,17 @@ -(void)repositionSubviews
 
 -(void)manuallyRotateToOrientation:(UIInterfaceOrientation)newOrientation duration:(NSTimeInterval)duration
 {
+	if (ignoreRotations) {
+		return;
+	}
+
 	UIApplication * ourApp = [UIApplication sharedApplication];
 	if (newOrientation != [ourApp statusBarOrientation])
 	{
 		[keyboardFocusedProxy blur:nil];
 		[ourApp setStatusBarOrientation:newOrientation animated:(duration > 0.0)];
 		[keyboardFocusedProxy focus:nil];
 	}
-
-	// if already in the orientation, don't do it again
-	if (lastOrientation==newOrientation)
-	{
-		return;
-	}
 
 	CGAffineTransform transform;