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-23701] iOS: Fix storyboard-regression #8169

Merged
merged 1 commit into from
Aug 1, 2016
Merged

[TIMOB-23701] iOS: Fix storyboard-regression #8169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions iphone/Classes/TiRootViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
BOOL forceLayout;
UIImageView* defaultImageView;

#ifdef LAUNCHSCREEN_STORYBOARD
UIView *storyboardView;
#endif

//Keyboard stuff
BOOL updatingAccessoryView;
UIView * enteringAccessoryView; //View that will enter.
Expand Down
12 changes: 6 additions & 6 deletions iphone/Classes/TiRootViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,9 @@ -(void)loadView
hostView.backgroundColor = [UIColor clearColor];

#ifdef LAUNCHSCREEN_STORYBOARD
UIView *launchScreenContainer = [[UIView alloc] initWithFrame:[rootView bounds]];
[launchScreenContainer addSubview:[[[UIStoryboard storyboardWithName:@"LaunchScreen" bundle:[NSBundle mainBundle]] instantiateInitialViewController] view]];
[hostView addSubview:launchScreenContainer];
[launchScreenContainer release];
storyboardView = [[UIView alloc] initWithFrame:[rootView bounds]];
[storyboardView addSubview:[[[UIStoryboard storyboardWithName:@"LaunchScreen" bundle:[NSBundle mainBundle]] instantiateInitialViewController] view]];
[hostView addSubview:storyboardView];
#endif

hostView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down Expand Up @@ -273,8 +272,9 @@ -(void)dismissDefaultImage
}

#ifdef LAUNCHSCREEN_STORYBOARD
if (hostView) {
[[[hostView subviews] objectAtIndex:0] removeFromSuperview];
if (storyboardView != nil) {
[storyboardView removeFromSuperview];
RELEASE_TO_NIL(storyboardView);
}
#endif
}
Expand Down