Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-15078] (3_1_X) NavigationWindow does not animate close when opened modally #4678

Merged
merged 3 commits into from
Sep 12, 2013
Merged

[TIMOB-15078] (3_1_X) NavigationWindow does not animate close when opened modally #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05b0eb8
[TIMOB-15078] Improve error message
vishalduggal Sep 12, 2013
8401db2
[TIMOB-15078] Hold off destroying views till window closes
vishalduggal Sep 12, 2013
9b7f8e7
Clean up logs
vishalduggal Sep 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions iphone/Classes/TiRootViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIiOSNavWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ -(void)windowWillOpen
}


-(void) windowWillClose
-(void) windowDidClose
{
[self cleanNavStack];
[super windowWillClose];
[super windowDidClose];
}

-(void)willChangeSize
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ -(TiViewProxy*) proxy
return _proxy;
}

#if defined(DEBUG) || defined(DEVELOPER)
#ifdef DEVELOPER
- (void)viewWillLayoutSubviews
{
CGRect bounds = [[self view] bounds];
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions iphone/Classes/TiWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,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);
}
Expand All @@ -268,8 +268,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);
}
Expand Down