Skip to content

Commit ff6d2e5

Browse files
only loading master view if allowed by self.isMasterViewControllerHidden
1 parent db96c38 commit ff6d2e5

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

CTSplitViewController/CTSplitViewController.m

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,23 @@ - (void)didReceiveMemoryWarning
160160
- (void)loadView {
161161
[super loadView];
162162

163-
#warning only load master view if not hidden
164-
[self.masterViewController viewWillAppear:NO];
165-
[self _loadMasterView];
166-
[self.view addSubview:_masterView];
167-
[self.masterViewController viewDidAppear:NO];
168-
163+
// first load _detailsView because its always visible
169164
[self.detailsViewController viewWillAppear:NO];
170165
[self _loadDetailsView];
171166
[self.view addSubview:_detailsView];
172167
[self.detailsViewController viewDidAppear:NO];
173168

169+
if (!self.isMasterViewControllerHidden) {
170+
// load master view if allowed
171+
[self.masterViewController viewWillAppear:NO];
172+
[self _loadMasterView];
173+
[self.view addSubview:_masterView];
174+
[self.masterViewController viewDidAppear:NO];
175+
} else {
176+
// not allowed to load master view, update details view frame
177+
_detailsView.frame = self.view.bounds;
178+
}
179+
174180
_rightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(_rightSwipeGestureRecognized:)];
175181
_rightSwipeGestureRecognizer.direction = UISwipeGestureRecognizerDirectionRight;
176182
_rightSwipeGestureRecognizer.enabled = self.isMasterViewControllerHidden;

0 commit comments

Comments
 (0)