Merge pull request #4677 from vishalduggal/timob-15078

[TIMOB-15078] NavigationWindow does not animate close when opened modally
tidev · Sep 12, 2013 · 0aa3446 · 0aa3446
2 parents 119de36 + 120286d
commit 0aa3446
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -963,7 +963,7 @@ - (BOOL)shouldRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOr
     return TI_ORIENTATION_ALLOWED([self getFlags:check],toInterfaceOrientation) ? YES : NO;
 }
 
-#if defined(DEBUG) || defined(DEVELOPER)
+#ifdef DEVELOPER
 - (void)viewWillLayoutSubviews
 {
     CGRect bounds = [[self view] bounds];
@@ -974,7 +974,7 @@ - (void)viewWillLayoutSubviews
 
 - (void)viewDidLayoutSubviews
 {
-#if defined(DEBUG) || defined(DEVELOPER)
+#ifdef DEVELOPER
     CGRect bounds = [[self view] bounds];
     NSLog(@"ROOT DID LAYOUT SUBVIEWS %.1f %.1f",bounds.size.width, bounds.size.height);
 #endif

diff --git a/iphone/Classes/TiUIiOSNavWindowProxy.m b/iphone/Classes/TiUIiOSNavWindowProxy.m
@@ -391,10 +391,10 @@ -(void)windowWillOpen
 }
 
 
--(void) windowWillClose
+-(void) windowDidClose
 {
     [self cleanNavStack];
-    [super windowWillClose];
+    [super windowDidClose];
 }
 
 -(void)willChangeSize

diff --git a/iphone/Classes/TiViewController.m b/iphone/Classes/TiViewController.m
@@ -39,7 +39,7 @@ -(TiViewProxy*) proxy
     return _proxy;
 }
 
-#if defined(DEBUG) || defined(DEVELOPER)
+#ifdef DEVELOPER
 - (void)viewWillLayoutSubviews
 {
     CGRect bounds = [[self view] bounds];
@@ -50,7 +50,7 @@ - (void)viewWillLayoutSubviews
 
 - (void)viewDidLayoutSubviews
 {
-#if defined(DEBUG) || defined(DEVELOPER)
+#ifdef DEVELOPER
     CGRect bounds = [[self view] bounds];
     NSLog(@"TIVIEWCONTROLLER DID LAYOUT SUBVIEWS %.1f %.1f",bounds.size.width, bounds.size.height);
 #endif

diff --git a/iphone/Classes/TiWindowProxy.m b/iphone/Classes/TiWindowProxy.m
@@ -271,8 +271,8 @@ -(BOOL)_handleOpen:(id)args
         RELEASE_TO_NIL(openAnimation);
     }
 
-    if ( (tab == nil) && (isModal == NO) && ([theController topPresentedController] != [theController topContainerController]) ){
-        DeveloperLog(@"[WARN] The top View controller is not a container controller. This window will open behind the presented controller.")
+    if ( (!self.isManaged) && (!isModal) && (openAnimation != nil) && ([theController topPresentedController] != [theController topContainerController]) ){
+        DeveloperLog(@"[WARN] The top View controller is not a container controller. This window will open behind the presented controller without animations.")
         [self forgetProxy:openAnimation];
         RELEASE_TO_NIL(openAnimation);
     }
@@ -287,8 +287,8 @@ -(BOOL)_handleClose:(id)args
         [self forgetProxy:closeAnimation];
         RELEASE_TO_NIL(closeAnimation);
     }
-    if ( (tab == nil) && (isModal == NO) && ([theController topPresentedController] != [theController topContainerController]) ){
-        DeveloperLog(@"[WARN] The top View controller is not a container controller. This window will open behind the presented controller.")
+    if ( (!self.isManaged) && (!isModal) && (closeAnimation != nil) && ([theController topPresentedController] != [theController topContainerController]) ){
+        DeveloperLog(@"[WARN] The top View controller is not a container controller. This window will close behind the presented controller without animations.")
         [self forgetProxy:closeAnimation];
         RELEASE_TO_NIL(closeAnimation);
     }