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

Better compatibility with UISplitViewController #34

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Better compatibility with UISplitViewController #34

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6423283
The default action for the UIBarButtonItem supplied by the MGSplitVie…
maikg Jan 20, 2011
71ff95d
Default the title of the bar button item to the master view controlle…
maikg Mar 3, 2011
f48c4dd
Fixed view sizing bug for using splitview in a UINavigationController
Oct 16, 2010
47e9bac
Take tab bar into account when calculating available view size.
maikg Mar 3, 2011
e04b93b
Fixed crash: "Popovers cannot be presented from a view which does not…
viteinfinite Dec 16, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions Classes/MGSplitViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ - (CGSize)splitViewSizeForOrientation:(UIInterfaceOrientation)theOrientation
// Little bit ugly looking, but it'll still work even if they change the status bar height in future.
float statusBarHeight = MAX((fullScreenRect.size.width - appFrame.size.width), (fullScreenRect.size.height - appFrame.size.height));

float navigationBarHeight = 0;
if ((self.navigationController)&&(!self.navigationController.navigationBarHidden)) {
navigationBarHeight = self.navigationController.navigationBar.frame.size.height;
}

CGFloat tabBarHeight = 0;
if (self.tabBarController) {
tabBarHeight = self.tabBarController.tabBar.frame.size.height;
}

// Initially assume portrait orientation.
float width = fullScreenRect.size.width;
float height = fullScreenRect.size.height;
Expand All @@ -243,6 +253,8 @@ - (CGSize)splitViewSizeForOrientation:(UIInterfaceOrientation)theOrientation

// Account for status bar, which always subtracts from the height (since it's always at the top of the screen).
height -= statusBarHeight;
height -= navigationBarHeight;
height -= tabBarHeight;

return CGSizeMake(width, height);
}
Expand Down Expand Up @@ -561,7 +573,11 @@ - (void)reconfigureForMasterInPopover:(BOOL)inPopover
[self.masterViewController viewDidDisappear:NO];

// Create and configure _barButtonItem.
_barButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Master", nil)
NSString *barButtonItemTitle = self.masterViewController.title;
if (barButtonItemTitle == nil) {
barButtonItemTitle = @"Master";
}
_barButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(barButtonItemTitle, nil)
style:UIBarButtonItemStyleBordered
target:self
action:@selector(showMasterPopover:)];
Expand All @@ -576,8 +592,9 @@ - (void)reconfigureForMasterInPopover:(BOOL)inPopover

} else if (!inPopover && _hiddenPopoverController && _barButtonItem) {
// I know this looks strange, but it fixes a bizarre issue with UIPopoverController leaving masterViewController's views in disarray.
if (self.view.window != nil) {
[_hiddenPopoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:NO];

}
// Remove master from popover and destroy popover, if it exists.
[_hiddenPopoverController dismissPopoverAnimated:NO];
[_hiddenPopoverController release];
Expand Down Expand Up @@ -704,16 +721,21 @@ - (IBAction)toggleMasterView:(id)sender

- (IBAction)showMasterPopover:(id)sender
{
if (_hiddenPopoverController && !(_hiddenPopoverController.popoverVisible)) {
// Inform delegate.
if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
popoverController:_hiddenPopoverController
willPresentViewController:self.masterViewController];
}

// Show popover.
[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
if (_hiddenPopoverController) {
if (_hiddenPopoverController.popoverVisible) {
[_hiddenPopoverController dismissPopoverAnimated:YES];
}
else {
// Inform delegate.
if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
popoverController:_hiddenPopoverController
willPresentViewController:self.masterViewController];
}

// Show popover.
[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
}
}
}

Expand Down