sheepy-clone: comparison project_files/HedgewarsMobile/Classes/MGSplitViewController/MGSplitViewController.m

equal deleted inserted replaced

-:ea4d6a7a2937
+:a00b0fa0dbd7
 #import "MGSplitViewController.h"
 #import "MGSplitDividerView.h"
 #import "MGSplitCornersView.h"
-#define MG_DEFAULT_SPLIT_POSITION		320.0	// default width of master view in UISplitViewController.
+#define MG_DEFAULT_SPLIT_POSITION       320.0   // default width of master view in UISplitViewController.
-#define MG_DEFAULT_SPLIT_WIDTH			1.0		// default width of split-gutter in UISplitViewController.
+#define MG_DEFAULT_SPLIT_WIDTH          1.0     // default width of split-gutter in UISplitViewController.
-#define MG_DEFAULT_CORNER_RADIUS		5.0		// default corner-radius of overlapping split-inner corners on the master and detail views.
+#define MG_DEFAULT_CORNER_RADIUS        5.0     // default corner-radius of overlapping split-inner corners on the master and detail views.
-#define MG_DEFAULT_CORNER_COLOR			[UIColor blackColor]	// default color of intruding inner corners (and divider background).
+#define MG_DEFAULT_CORNER_COLOR         [UIColor blackColor]    // default color of intruding inner corners (and divider background).
-#define MG_PANESPLITTER_CORNER_RADIUS	0.0		// corner-radius of split-inner corners for MGSplitViewDividerStylePaneSplitter style.
+#define MG_PANESPLITTER_CORNER_RADIUS   0.0     // corner-radius of split-inner corners for MGSplitViewDividerStylePaneSplitter style.
-#define MG_PANESPLITTER_SPLIT_WIDTH		25.0	// width of split-gutter for MGSplitViewDividerStylePaneSplitter style.
+#define MG_PANESPLITTER_SPLIT_WIDTH     25.0    // width of split-gutter for MGSplitViewDividerStylePaneSplitter style.
-#define MG_MIN_VIEW_WIDTH				200.0	// minimum width a view is allowed to become as a result of changing the splitPosition.
+#define MG_MIN_VIEW_WIDTH               200.0   // minimum width a view is allowed to become as a result of changing the splitPosition.
-#define MG_ANIMATION_CHANGE_SPLIT_ORIENTATION	@"ChangeSplitOrientation"	// Animation ID for internal use.
+#define MG_ANIMATION_CHANGE_SPLIT_ORIENTATION   @"ChangeSplitOrientation"   // Animation ID for internal use.
-#define MG_ANIMATION_CHANGE_SUBVIEWS_ORDER		@"ChangeSubviewsOrder"	// Animation ID for internal use.
+#define MG_ANIMATION_CHANGE_SUBVIEWS_ORDER      @"ChangeSubviewsOrder"  // Animation ID for internal use.
 @interface MGSplitViewController (MGPrivateMethods)
 - (void)setup;
 #pragma mark Orientation helpers
 - (NSString *)nameOfInterfaceOrientation:(UIInterfaceOrientation)theOrientation
 {
-	NSString *orientationName = nil;
+NSString *orientationName = nil;
-	switch (theOrientation) {
+switch (theOrientation) {
-		case UIInterfaceOrientationPortrait:
+case UIInterfaceOrientationPortrait:
-			orientationName = @"Portrait"; // Home button at bottom
+orientationName = @"Portrait"; // Home button at bottom
-			break;
+break;
-		case UIInterfaceOrientationPortraitUpsideDown:
+case UIInterfaceOrientationPortraitUpsideDown:
-			orientationName = @"Portrait (Upside Down)"; // Home button at top
+orientationName = @"Portrait (Upside Down)"; // Home button at top
-			break;
+break;
-		case UIInterfaceOrientationLandscapeLeft:
+case UIInterfaceOrientationLandscapeLeft:
-			orientationName = @"Landscape (Left)"; // Home button on left
+orientationName = @"Landscape (Left)"; // Home button on left
-			break;
+break;
-		case UIInterfaceOrientationLandscapeRight:
+case UIInterfaceOrientationLandscapeRight:
-			orientationName = @"Landscape (Right)"; // Home button on right
+orientationName = @"Landscape (Right)"; // Home button on right
-			break;
+break;
-		default:
+default:
-			break;
+break;
-	}
+}
-	return orientationName;
+return orientationName;
 }
 - (BOOL)isLandscape
 {
-	return UIInterfaceOrientationIsLandscape(self.interfaceOrientation);
+return UIInterfaceOrientationIsLandscape(self.interfaceOrientation);
 }
 - (BOOL)shouldShowMasterForInterfaceOrientation:(UIInterfaceOrientation)theOrientation
 {
-	// Returns YES if master view should be shown directly embedded in the splitview, instead of hidden in a popover.
+// Returns YES if master view should be shown directly embedded in the splitview, instead of hidden in a popover.
-	return ((UIInterfaceOrientationIsLandscape(theOrientation)) ? _showsMasterInLandscape : _showsMasterInPortrait);
+return ((UIInterfaceOrientationIsLandscape(theOrientation)) ? _showsMasterInLandscape : _showsMasterInPortrait);
 }
 - (BOOL)shouldShowMaster
 {
-	return [self shouldShowMasterForInterfaceOrientation:self.interfaceOrientation];
+return [self shouldShowMasterForInterfaceOrientation:self.interfaceOrientation];
 }
 - (BOOL)isShowingMaster
 {
-	return [self shouldShowMaster] && self.masterViewController && self.masterViewController.view && ([self.masterViewController.view superview] == self.view);
+return [self shouldShowMaster] && self.masterViewController && self.masterViewController.view && ([self.masterViewController.view superview] == self.view);
 }
 #pragma mark -
 #pragma mark Setup and Teardown
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-	if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
+if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-		[self setup];
+[self setup];
-	}
+}
-	return self;
+return self;
 }
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-	if ((self = [super initWithCoder:aDecoder])) {
+if ((self = [super initWithCoder:aDecoder])) {
-		[self setup];
+[self setup];
-	}
+}
-	return self;
+return self;
 }
 - (void)setup
 {
-	// Configure default behaviour.
+// Configure default behaviour.
-	_viewControllers = [[NSMutableArray alloc] initWithObjects:[NSNull null], [NSNull null], nil];
+_viewControllers = [[NSMutableArray alloc] initWithObjects:[NSNull null], [NSNull null], nil];
-	_splitWidth = MG_DEFAULT_SPLIT_WIDTH;
+_splitWidth = MG_DEFAULT_SPLIT_WIDTH;
-	_showsMasterInPortrait = NO;
+_showsMasterInPortrait = NO;
-	_showsMasterInLandscape = YES;
+_showsMasterInLandscape = YES;
-	_reconfigurePopup = NO;
+_reconfigurePopup = NO;
-	_vertical = YES;
+_vertical = YES;
-	_masterBeforeDetail = YES;
+_masterBeforeDetail = YES;
-	_splitPosition = MG_DEFAULT_SPLIT_POSITION;
+_splitPosition = MG_DEFAULT_SPLIT_POSITION;
-	CGRect divRect = self.view.bounds;
+CGRect divRect = self.view.bounds;
-	if ([self isVertical]) {
+if ([self isVertical]) {
-		divRect.origin.y = _splitPosition;
+divRect.origin.y = _splitPosition;
-		divRect.size.height = _splitWidth;
+divRect.size.height = _splitWidth;
-	} else {
+} else {
-		divRect.origin.x = _splitPosition;
+divRect.origin.x = _splitPosition;
-		divRect.size.width = _splitWidth;
+divRect.size.width = _splitWidth;
-	}
+}
-	_dividerView = [[MGSplitDividerView alloc] initWithFrame:divRect];
+_dividerView = [[MGSplitDividerView alloc] initWithFrame:divRect];
-	_dividerView.splitViewController = self;
+_dividerView.splitViewController = self;
-	_dividerView.backgroundColor = MG_DEFAULT_CORNER_COLOR;
+_dividerView.backgroundColor = MG_DEFAULT_CORNER_COLOR;
-	_dividerStyle = MGSplitViewDividerStyleThin;
+_dividerStyle = MGSplitViewDividerStyleThin;
 }
 - (void)dealloc
 {
-	_delegate = nil;
+_delegate = nil;
-	[self.view.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+[self.view.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-	[_viewControllers release];
+[_viewControllers release];
-	[_barButtonItem release];
+[_barButtonItem release];
-	[_hiddenPopoverController release];
+[_hiddenPopoverController release];
-	[_dividerView release];
+[_dividerView release];
-	[_cornerViews release];
+[_cornerViews release];
-	[super dealloc];
+[super dealloc];
 }
 #pragma mark -
 #pragma mark View management
 }
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
-	[self.masterViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.masterViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	[self.detailViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.detailViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
 }
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
-	[self.masterViewController didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+[self.masterViewController didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-	[self.detailViewController didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+[self.detailViewController didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 }
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
-										 duration:(NSTimeInterval)duration
+duration:(NSTimeInterval)duration
 {
-	[self.masterViewController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.masterViewController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	[self.detailViewController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.detailViewController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	// Hide popover.
+// Hide popover.
-	if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-		[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-	}
+}
-	// Re-tile views.
+// Re-tile views.
-	_reconfigurePopup = YES;
+_reconfigurePopup = YES;
-	[self layoutSubviewsForInterfaceOrientation:toInterfaceOrientation withAnimation:YES];
+[self layoutSubviewsForInterfaceOrientation:toInterfaceOrientation withAnimation:YES];
 }
 - (void)willAnimateFirstHalfOfRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
-	[self.masterViewController willAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.masterViewController willAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	[self.detailViewController willAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+[self.detailViewController willAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
 }
 - (void)didAnimateFirstHalfOfRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
 {
-	[self.masterViewController didAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation];
+[self.masterViewController didAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation];
-	[self.detailViewController didAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation];
+[self.detailViewController didAnimateFirstHalfOfRotationToInterfaceOrientation:toInterfaceOrientation];
 }
 - (void)willAnimateSecondHalfOfRotationFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation duration:(NSTimeInterval)duration
 {
-	[self.masterViewController willAnimateSecondHalfOfRotationFromInterfaceOrientation:fromInterfaceOrientation duration:duration];
+[self.masterViewController willAnimateSecondHalfOfRotationFromInterfaceOrientation:fromInterfaceOrientation duration:duration];
-	[self.detailViewController willAnimateSecondHalfOfRotationFromInterfaceOrientation:fromInterfaceOrientation duration:duration];
+[self.detailViewController willAnimateSecondHalfOfRotationFromInterfaceOrientation:fromInterfaceOrientation duration:duration];
 }
 - (CGSize)splitViewSizeForOrientation:(UIInterfaceOrientation)theOrientation
 {
-	UIScreen *screen = [UIScreen mainScreen];
+UIScreen *screen = [UIScreen mainScreen];
-	CGRect fullScreenRect = screen.bounds; // always implicitly in Portrait orientation.
+CGRect fullScreenRect = screen.bounds; // always implicitly in Portrait orientation.
-	CGRect appFrame = screen.applicationFrame;
+CGRect appFrame = screen.applicationFrame;
-	// Find status bar height by checking which dimension of the applicationFrame is narrower than screen bounds.
+// Find status bar height by checking which dimension of the applicationFrame is narrower than screen bounds.
-	// Little bit ugly looking, but it'll still work even if they change the status bar height in future.
+// 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 statusBarHeight = MAX((fullScreenRect.size.width - appFrame.size.width), (fullScreenRect.size.height - appFrame.size.height));
-	// Initially assume portrait orientation.
+// Initially assume portrait orientation.
-	float width = fullScreenRect.size.width;
+float width = fullScreenRect.size.width;
-	float height = fullScreenRect.size.height;
+float height = fullScreenRect.size.height;
-	// Correct for orientation.
+// Correct for orientation.
-	if (UIInterfaceOrientationIsLandscape(theOrientation)) {
+if (UIInterfaceOrientationIsLandscape(theOrientation)) {
-		width = height;
+width = height;
-		height = fullScreenRect.size.width;
+height = fullScreenRect.size.width;
-	}
+}
-	// Account for status bar, which always subtracts from the height (since it's always at the top of the screen).
+// Account for status bar, which always subtracts from the height (since it's always at the top of the screen).
-	height -= statusBarHeight;
+height -= statusBarHeight;
-	return CGSizeMake(width, height);
+return CGSizeMake(width, height);
 }
 - (void)layoutSubviewsForInterfaceOrientation:(UIInterfaceOrientation)theOrientation withAnimation:(BOOL)animate
 {
-	if (_reconfigurePopup) {
+if (_reconfigurePopup) {
-		[self reconfigureForMasterInPopover:![self shouldShowMasterForInterfaceOrientation:theOrientation]];
+[self reconfigureForMasterInPopover:![self shouldShowMasterForInterfaceOrientation:theOrientation]];
-	}
+}
-	// Layout the master, detail and divider views appropriately, adding/removing subviews as needed.
+// Layout the master, detail and divider views appropriately, adding/removing subviews as needed.
-	// First obtain relevant geometry.
+// First obtain relevant geometry.
-	CGSize fullSize = [self splitViewSizeForOrientation:theOrientation];
+CGSize fullSize = [self splitViewSizeForOrientation:theOrientation];
-	float width = fullSize.width;
+float width = fullSize.width;
-	float height = fullSize.height;
+float height = fullSize.height;
-	if (NO) { // Just for debugging.
+if (NO) { // Just for debugging.
-		NSLog(@"Target orientation is %@, dimensions will be %.0f x %.0f",
+NSLog(@"Target orientation is %@, dimensions will be %.0f x %.0f",
-			  [self nameOfInterfaceOrientation:theOrientation], width, height);
+[self nameOfInterfaceOrientation:theOrientation], width, height);
-	}
+}
-	// Layout the master, divider and detail views.
+// Layout the master, divider and detail views.
-	CGRect newFrame = CGRectMake(0, 0, width, height);
+CGRect newFrame = CGRectMake(0, 0, width, height);
-	UIViewController *controller;
+UIViewController *controller;
-	UIView *theView;
+UIView *theView;
-	BOOL shouldShowMaster = [self shouldShowMasterForInterfaceOrientation:theOrientation];
+BOOL shouldShowMaster = [self shouldShowMasterForInterfaceOrientation:theOrientation];
-	BOOL masterFirst = [self isMasterBeforeDetail];
+BOOL masterFirst = [self isMasterBeforeDetail];
-	if ([self isVertical]) {
+if ([self isVertical]) {
-		// Master on left, detail on right (or vice versa).
+// Master on left, detail on right (or vice versa).
-		CGRect masterRect, dividerRect, detailRect;
+CGRect masterRect, dividerRect, detailRect;
-		if (masterFirst) {
+if (masterFirst) {
-			if (!shouldShowMaster) {
+if (!shouldShowMaster) {
-				// Move off-screen.
+// Move off-screen.
-				newFrame.origin.x -= (_splitPosition + _splitWidth);
+newFrame.origin.x -= (_splitPosition + _splitWidth);
-			}
+}
-			newFrame.size.width = _splitPosition;
+newFrame.size.width = _splitPosition;
-			masterRect = newFrame;
+masterRect = newFrame;
-			newFrame.origin.x += newFrame.size.width;
+newFrame.origin.x += newFrame.size.width;
-			newFrame.size.width = _splitWidth;
+newFrame.size.width = _splitWidth;
-			dividerRect = newFrame;
+dividerRect = newFrame;
-			newFrame.origin.x += newFrame.size.width;
+newFrame.origin.x += newFrame.size.width;
-			newFrame.size.width = width - newFrame.origin.x;
+newFrame.size.width = width - newFrame.origin.x;
-			detailRect = newFrame;
+detailRect = newFrame;
-		} else {
+} else {
-			if (!shouldShowMaster) {
+if (!shouldShowMaster) {
-				// Move off-screen.
+// Move off-screen.
-				newFrame.size.width += (_splitPosition + _splitWidth);
+newFrame.size.width += (_splitPosition + _splitWidth);
-			}
+}
-			newFrame.size.width -= (_splitPosition + _splitWidth);
+newFrame.size.width -= (_splitPosition + _splitWidth);
-			detailRect = newFrame;
+detailRect = newFrame;
-			newFrame.origin.x += newFrame.size.width;
+newFrame.origin.x += newFrame.size.width;
-			newFrame.size.width = _splitWidth;
+newFrame.size.width = _splitWidth;
-			dividerRect = newFrame;
+dividerRect = newFrame;
-			newFrame.origin.x += newFrame.size.width;
+newFrame.origin.x += newFrame.size.width;
-			newFrame.size.width = _splitPosition;
+newFrame.size.width = _splitPosition;
-			masterRect = newFrame;
+masterRect = newFrame;
-		}
+}
-		// Position master.
+// Position master.
-		controller = self.masterViewController;
+controller = self.masterViewController;
-		if (controller && [controller isKindOfClass:[UIViewController class]])  {
+if (controller && [controller isKindOfClass:[UIViewController class]])  {
-			theView = controller.view;
+theView = controller.view;
-			if (theView) {
+if (theView) {
-				theView.frame = masterRect;
+theView.frame = masterRect;
-				if (!theView.superview) {
+if (!theView.superview) {
-					[controller viewWillAppear:NO];
+[controller viewWillAppear:NO];
-					[self.view addSubview:theView];
+[self.view addSubview:theView];
-					[controller viewDidAppear:NO];
+[controller viewDidAppear:NO];
-				}
+}
-			}
+}
-		}
+}
-		// Position divider.
+// Position divider.
-		theView = _dividerView;
+theView = _dividerView;
-		theView.frame = dividerRect;
+theView.frame = dividerRect;
-		if (!theView.superview) {
+if (!theView.superview) {
-			[self.view addSubview:theView];
+[self.view addSubview:theView];
-		}
+}
-		// Position detail.
+// Position detail.
-		controller = self.detailViewController;
+controller = self.detailViewController;
-		if (controller && [controller isKindOfClass:[UIViewController class]])  {
+if (controller && [controller isKindOfClass:[UIViewController class]])  {
-			theView = controller.view;
+theView = controller.view;
-			if (theView) {
+if (theView) {
-				theView.frame = detailRect;
+theView.frame = detailRect;
-				if (!theView.superview) {
+if (!theView.superview) {
-					[self.view insertSubview:theView aboveSubview:self.masterViewController.view];
+[self.view insertSubview:theView aboveSubview:self.masterViewController.view];
-				} else {
+} else {
-					[self.view bringSubviewToFront:theView];
+[self.view bringSubviewToFront:theView];
-				}
+}
-			}
+}
-		}
+}
-	} else {
+} else {
-		// Master above, detail below (or vice versa).
+// Master above, detail below (or vice versa).
-		CGRect masterRect, dividerRect, detailRect;
+CGRect masterRect, dividerRect, detailRect;
-		if (masterFirst) {
+if (masterFirst) {
-			if (!shouldShowMaster) {
+if (!shouldShowMaster) {
-				// Move off-screen.
+// Move off-screen.
-				newFrame.origin.y -= (_splitPosition + _splitWidth);
+newFrame.origin.y -= (_splitPosition + _splitWidth);
-			}
+}
-			newFrame.size.height = _splitPosition;
+newFrame.size.height = _splitPosition;
-			masterRect = newFrame;
+masterRect = newFrame;
-			newFrame.origin.y += newFrame.size.height;
+newFrame.origin.y += newFrame.size.height;
-			newFrame.size.height = _splitWidth;
+newFrame.size.height = _splitWidth;
-			dividerRect = newFrame;
+dividerRect = newFrame;
-			newFrame.origin.y += newFrame.size.height;
+newFrame.origin.y += newFrame.size.height;
-			newFrame.size.height = height - newFrame.origin.y;
+newFrame.size.height = height - newFrame.origin.y;
-			detailRect = newFrame;
+detailRect = newFrame;
-		} else {
+} else {
-			if (!shouldShowMaster) {
+if (!shouldShowMaster) {
-				// Move off-screen.
+// Move off-screen.
-				newFrame.size.height += (_splitPosition + _splitWidth);
+newFrame.size.height += (_splitPosition + _splitWidth);
-			}
+}
-			newFrame.size.height -= (_splitPosition + _splitWidth);
+newFrame.size.height -= (_splitPosition + _splitWidth);
-			detailRect = newFrame;
+detailRect = newFrame;
-			newFrame.origin.y += newFrame.size.height;
+newFrame.origin.y += newFrame.size.height;
-			newFrame.size.height = _splitWidth;
+newFrame.size.height = _splitWidth;
-			dividerRect = newFrame;
+dividerRect = newFrame;
-			newFrame.origin.y += newFrame.size.height;
+newFrame.origin.y += newFrame.size.height;
-			newFrame.size.height = _splitPosition;
+newFrame.size.height = _splitPosition;
-			masterRect = newFrame;
+masterRect = newFrame;
-		}
+}
-		// Position master.
+// Position master.
-		controller = self.masterViewController;
+controller = self.masterViewController;
-		if (controller && [controller isKindOfClass:[UIViewController class]])  {
+if (controller && [controller isKindOfClass:[UIViewController class]])  {
-			theView = controller.view;
+theView = controller.view;
-			if (theView) {
+if (theView) {
-				theView.frame = masterRect;
+theView.frame = masterRect;
-				if (!theView.superview) {
+if (!theView.superview) {
-					[controller viewWillAppear:NO];
+[controller viewWillAppear:NO];
-					[self.view addSubview:theView];
+[self.view addSubview:theView];
-					[controller viewDidAppear:NO];
+[controller viewDidAppear:NO];
-				}
+}
-			}
+}
-		}
+}
-		// Position divider.
+// Position divider.
-		theView = _dividerView;
+theView = _dividerView;
-		theView.frame = dividerRect;
+theView.frame = dividerRect;
-		if (!theView.superview) {
+if (!theView.superview) {
-			[self.view addSubview:theView];
+[self.view addSubview:theView];
-		}
+}
-		// Position detail.
+// Position detail.
-		controller = self.detailViewController;
+controller = self.detailViewController;
-		if (controller && [controller isKindOfClass:[UIViewController class]])  {
+if (controller && [controller isKindOfClass:[UIViewController class]])  {
-			theView = controller.view;
+theView = controller.view;
-			if (theView) {
+if (theView) {
-				theView.frame = detailRect;
+theView.frame = detailRect;
-				if (!theView.superview) {
+if (!theView.superview) {
-					[self.view insertSubview:theView aboveSubview:self.masterViewController.view];
+[self.view insertSubview:theView aboveSubview:self.masterViewController.view];
-				} else {
+} else {
-					[self.view bringSubviewToFront:theView];
+[self.view bringSubviewToFront:theView];
-				}
+}
-			}
+}
-		}
+}
-	}
+}
-	// Create corner views if necessary.
+// Create corner views if necessary.
-	MGSplitCornersView *leadingCorners; // top/left of screen in vertical/horizontal split.
+MGSplitCornersView *leadingCorners; // top/left of screen in vertical/horizontal split.
-	MGSplitCornersView *trailingCorners; // bottom/right of screen in vertical/horizontal split.
+MGSplitCornersView *trailingCorners; // bottom/right of screen in vertical/horizontal split.
-	if (!_cornerViews) {
+if (!_cornerViews) {
-		CGRect cornerRect = CGRectMake(0, 0, 10, 10); // arbitrary, will be resized below.
+CGRect cornerRect = CGRectMake(0, 0, 10, 10); // arbitrary, will be resized below.
-		leadingCorners = [[MGSplitCornersView alloc] initWithFrame:cornerRect];
+leadingCorners = [[MGSplitCornersView alloc] initWithFrame:cornerRect];
-		leadingCorners.splitViewController = self;
+leadingCorners.splitViewController = self;
-		leadingCorners.cornerBackgroundColor = MG_DEFAULT_CORNER_COLOR;
+leadingCorners.cornerBackgroundColor = MG_DEFAULT_CORNER_COLOR;
-		leadingCorners.cornerRadius = MG_DEFAULT_CORNER_RADIUS;
+leadingCorners.cornerRadius = MG_DEFAULT_CORNER_RADIUS;
-		trailingCorners = [[MGSplitCornersView alloc] initWithFrame:cornerRect];
+trailingCorners = [[MGSplitCornersView alloc] initWithFrame:cornerRect];
-		trailingCorners.splitViewController = self;
+trailingCorners.splitViewController = self;
-		trailingCorners.cornerBackgroundColor = MG_DEFAULT_CORNER_COLOR;
+trailingCorners.cornerBackgroundColor = MG_DEFAULT_CORNER_COLOR;
-		trailingCorners.cornerRadius = MG_DEFAULT_CORNER_RADIUS;
+trailingCorners.cornerRadius = MG_DEFAULT_CORNER_RADIUS;
-		_cornerViews = [[NSArray alloc] initWithObjects:leadingCorners, trailingCorners, nil];
+_cornerViews = [[NSArray alloc] initWithObjects:leadingCorners, trailingCorners, nil];
-		[leadingCorners release];
+[leadingCorners release];
-		[trailingCorners release];
+[trailingCorners release];
-	} else if ([_cornerViews count] == 2) {
+} else if ([_cornerViews count] == 2) {
-		leadingCorners = [_cornerViews objectAtIndex:0];
+leadingCorners = [_cornerViews objectAtIndex:0];
-		trailingCorners = [_cornerViews objectAtIndex:1];
+trailingCorners = [_cornerViews objectAtIndex:1];
-	}
+}
-	// Configure and layout the corner-views.
+// Configure and layout the corner-views.
-	leadingCorners.cornersPosition = (_vertical) ? MGCornersPositionLeadingVertical : MGCornersPositionLeadingHorizontal;
+leadingCorners.cornersPosition = (_vertical) ? MGCornersPositionLeadingVertical : MGCornersPositionLeadingHorizontal;
-	trailingCorners.cornersPosition = (_vertical) ? MGCornersPositionTrailingVertical : MGCornersPositionTrailingHorizontal;
+trailingCorners.cornersPosition = (_vertical) ? MGCornersPositionTrailingVertical : MGCornersPositionTrailingHorizontal;
-	leadingCorners.autoresizingMask = (_vertical) ? UIViewAutoresizingFlexibleBottomMargin : UIViewAutoresizingFlexibleRightMargin;
+leadingCorners.autoresizingMask = (_vertical) ? UIViewAutoresizingFlexibleBottomMargin : UIViewAutoresizingFlexibleRightMargin;
-	trailingCorners.autoresizingMask = (_vertical) ? UIViewAutoresizingFlexibleTopMargin : UIViewAutoresizingFlexibleLeftMargin;
+trailingCorners.autoresizingMask = (_vertical) ? UIViewAutoresizingFlexibleTopMargin : UIViewAutoresizingFlexibleLeftMargin;
-	float x, y, cornersWidth, cornersHeight;
+float x, y, cornersWidth, cornersHeight;
-	CGRect leadingRect, trailingRect;
+CGRect leadingRect, trailingRect;
-	float radius = leadingCorners.cornerRadius;
+float radius = leadingCorners.cornerRadius;
-	if (_vertical) { // left/right split
+if (_vertical) { // left/right split
-		cornersWidth = (radius * 2.0) + _splitWidth;
+cornersWidth = (radius * 2.0) + _splitWidth;
-		cornersHeight = radius;
+cornersHeight = radius;
-		x = ((shouldShowMaster) ? ((masterFirst) ? _splitPosition : width - (_splitPosition + _splitWidth)) : (0 - _splitWidth)) - radius;
+x = ((shouldShowMaster) ? ((masterFirst) ? _splitPosition : width - (_splitPosition + _splitWidth)) : (0 - _splitWidth)) - radius;
-		y = 0;
+y = 0;
-		leadingRect = CGRectMake(x, y, cornersWidth, cornersHeight); // top corners
+leadingRect = CGRectMake(x, y, cornersWidth, cornersHeight); // top corners
-		trailingRect = CGRectMake(x, (height - cornersHeight), cornersWidth, cornersHeight); // bottom corners
+trailingRect = CGRectMake(x, (height - cornersHeight), cornersWidth, cornersHeight); // bottom corners
-	} else { // top/bottom split
+} else { // top/bottom split
-		x = 0;
+x = 0;
-		y = ((shouldShowMaster) ? ((masterFirst) ? _splitPosition : height - (_splitPosition + _splitWidth)) : (0 - _splitWidth)) - radius;
+y = ((shouldShowMaster) ? ((masterFirst) ? _splitPosition : height - (_splitPosition + _splitWidth)) : (0 - _splitWidth)) - radius;
-		cornersWidth = radius;
+cornersWidth = radius;
-		cornersHeight = (radius * 2.0) + _splitWidth;
+cornersHeight = (radius * 2.0) + _splitWidth;
-		leadingRect = CGRectMake(x, y, cornersWidth, cornersHeight); // left corners
+leadingRect = CGRectMake(x, y, cornersWidth, cornersHeight); // left corners
-		trailingRect = CGRectMake((width - cornersWidth), y, cornersWidth, cornersHeight); // right corners
+trailingRect = CGRectMake((width - cornersWidth), y, cornersWidth, cornersHeight); // right corners
-	}
+}
-	leadingCorners.frame = leadingRect;
+leadingCorners.frame = leadingRect;
-	trailingCorners.frame = trailingRect;
+trailingCorners.frame = trailingRect;
-	// Ensure corners are visible and frontmost.
+// Ensure corners are visible and frontmost.
-	if (!leadingCorners.superview) {
+if (!leadingCorners.superview) {
-		[self.view insertSubview:leadingCorners aboveSubview:self.detailViewController.view];
+[self.view insertSubview:leadingCorners aboveSubview:self.detailViewController.view];
-		[self.view insertSubview:trailingCorners aboveSubview:self.detailViewController.view];
+[self.view insertSubview:trailingCorners aboveSubview:self.detailViewController.view];
-	} else {
+} else {
-		[self.view bringSubviewToFront:leadingCorners];
+[self.view bringSubviewToFront:leadingCorners];
-		[self.view bringSubviewToFront:trailingCorners];
+[self.view bringSubviewToFront:trailingCorners];
-	}
+}
 }
 - (void)layoutSubviewsWithAnimation:(BOOL)animate
 {
-	[self layoutSubviewsForInterfaceOrientation:self.interfaceOrientation withAnimation:animate];
+[self layoutSubviewsForInterfaceOrientation:self.interfaceOrientation withAnimation:animate];
 }
 - (void)layoutSubviews
 {
-	[self layoutSubviewsForInterfaceOrientation:self.interfaceOrientation withAnimation:YES];
+[self layoutSubviewsForInterfaceOrientation:self.interfaceOrientation withAnimation:YES];
 }
 - (void)viewWillAppear:(BOOL)animated
 {
-	[super viewWillAppear:animated];
+[super viewWillAppear:animated];
-	if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-		[self.masterViewController viewWillAppear:animated];
+[self.masterViewController viewWillAppear:animated];
-	}
+}
-	[self.detailViewController viewWillAppear:animated];
+[self.detailViewController viewWillAppear:animated];
-	_reconfigurePopup = YES;
+_reconfigurePopup = YES;
-	[self layoutSubviews];
+[self layoutSubviews];
 }
 - (void)viewDidAppear:(BOOL)animated
 {
-	[super viewDidAppear:animated];
+[super viewDidAppear:animated];
-	if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-		[self.masterViewController viewDidAppear:animated];
+[self.masterViewController viewDidAppear:animated];
-	}
+}
-	[self.detailViewController viewDidAppear:animated];
+[self.detailViewController viewDidAppear:animated];
 }
 - (void)viewWillDisappear:(BOOL)animated
 {
-	[super viewWillDisappear:animated];
+[super viewWillDisappear:animated];
-	if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-		[self.masterViewController viewWillDisappear:animated];
+[self.masterViewController viewWillDisappear:animated];
-	}
+}
-	[self.detailViewController viewWillDisappear:animated];
+[self.detailViewController viewWillDisappear:animated];
 }
 - (void)viewDidDisappear:(BOOL)animated
 {
-	[super viewDidDisappear:animated];
+[super viewDidDisappear:animated];
-	if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-		[self.masterViewController viewDidDisappear:animated];
+[self.masterViewController viewDidDisappear:animated];
-	}
+}
-	[self.detailViewController viewDidDisappear:animated];
+[self.detailViewController viewDidDisappear:animated];
 }
 #pragma mark -
 #pragma mark Popover handling
 - (void)reconfigureForMasterInPopover:(BOOL)inPopover
 {
-	_reconfigurePopup = NO;
+_reconfigurePopup = NO;
-	if ((inPopover && _hiddenPopoverController) || (!inPopover && !_hiddenPopoverController) || !self.masterViewController) {
+if ((inPopover && _hiddenPopoverController) || (!inPopover && !_hiddenPopoverController) || !self.masterViewController) {
-		// Nothing to do.
+// Nothing to do.
-		return;
+return;
-	}
+}
-	if (inPopover && !_hiddenPopoverController && !_barButtonItem) {
+if (inPopover && !_hiddenPopoverController && !_barButtonItem) {
-		// Create and configure popover for our masterViewController.
+// Create and configure popover for our masterViewController.
-		[_hiddenPopoverController release];
+[_hiddenPopoverController release];
-		_hiddenPopoverController = nil;
+_hiddenPopoverController = nil;
-		[self.masterViewController viewWillDisappear:NO];
+[self.masterViewController viewWillDisappear:NO];
-		_hiddenPopoverController = [[UIPopoverController alloc] initWithContentViewController:self.masterViewController];
+_hiddenPopoverController = [[UIPopoverController alloc] initWithContentViewController:self.masterViewController];
-		[self.masterViewController viewDidDisappear:NO];
+[self.masterViewController viewDidDisappear:NO];
-		// Create and configure _barButtonItem.
+// Create and configure _barButtonItem.
-		_barButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Master", nil)
+_barButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Master", nil)
-														  style:UIBarButtonItemStyleBordered
+style:UIBarButtonItemStyleBordered
-														 target:self
+target:self
-														 action:@selector(showMasterPopover:)];
+action:@selector(showMasterPopover:)];
-		// Inform delegate of this state of affairs.
+// Inform delegate of this state of affairs.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willHideViewController:withBarButtonItem:forPopoverController:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willHideViewController:withBarButtonItem:forPopoverController:)]) {
-			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
+[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
-																willHideViewController:self.masterViewController
+willHideViewController:self.masterViewController
-																	 withBarButtonItem:_barButtonItem
+withBarButtonItem:_barButtonItem
-																  forPopoverController:_hiddenPopoverController];
+forPopoverController:_hiddenPopoverController];
-		}
+}
-	} else if (!inPopover && _hiddenPopoverController && _barButtonItem) {
+} else if (!inPopover && _hiddenPopoverController && _barButtonItem) {
-		// I know this looks strange, but it fixes a bizarre issue with UIPopoverController leaving masterViewController's views in disarray.
+// I know this looks strange, but it fixes a bizarre issue with UIPopoverController leaving masterViewController's views in disarray.
-		[_hiddenPopoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:NO];
+[_hiddenPopoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:NO];
-		// Remove master from popover and destroy popover, if it exists.
+// Remove master from popover and destroy popover, if it exists.
-		[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-		[_hiddenPopoverController release];
+[_hiddenPopoverController release];
-		_hiddenPopoverController = nil;
+_hiddenPopoverController = nil;
-		// Inform delegate that the _barButtonItem will become invalid.
+// Inform delegate that the _barButtonItem will become invalid.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willShowViewController:invalidatingBarButtonItem:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willShowViewController:invalidatingBarButtonItem:)]) {
-			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
+[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
-																willShowViewController:self.masterViewController
+willShowViewController:self.masterViewController
-															 invalidatingBarButtonItem:_barButtonItem];
+invalidatingBarButtonItem:_barButtonItem];
-		}
+}
-		// Destroy _barButtonItem.
+// Destroy _barButtonItem.
-		[_barButtonItem release];
+[_barButtonItem release];
-		_barButtonItem = nil;
+_barButtonItem = nil;
-		// Move master view.
+// Move master view.
-		UIView *masterView = self.masterViewController.view;
+UIView *masterView = self.masterViewController.view;
-		if (masterView && masterView.superview != self.view) {
+if (masterView && masterView.superview != self.view) {
-			[masterView removeFromSuperview];
+[masterView removeFromSuperview];
-		}
+}
-	}
+}
 }
 - (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController
 {
-	[self reconfigureForMasterInPopover:NO];
+[self reconfigureForMasterInPopover:NO];
 }
 - (void)notePopoverDismissed
 {
-	[self popoverControllerDidDismissPopover:_hiddenPopoverController];
+[self popoverControllerDidDismissPopover:_hiddenPopoverController];
 }
 #pragma mark -
 #pragma mark Animations
 - (void)animationDidStop:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context
 {
-	if (([animationID isEqualToString:MG_ANIMATION_CHANGE_SPLIT_ORIENTATION] ||
+if (([animationID isEqualToString:MG_ANIMATION_CHANGE_SPLIT_ORIENTATION] ||
-		 [animationID isEqualToString:MG_ANIMATION_CHANGE_SUBVIEWS_ORDER])
+[animationID isEqualToString:MG_ANIMATION_CHANGE_SUBVIEWS_ORDER])
-		&& _cornerViews) {
+&& _cornerViews) {
-		for (UIView *corner in _cornerViews) {
+for (UIView *corner in _cornerViews) {
-			corner.hidden = NO;
+corner.hidden = NO;
-		}
+}
-		_dividerView.hidden = NO;
+_dividerView.hidden = NO;
-	}
+}
 }
 #pragma mark -
 #pragma mark IB Actions
 - (IBAction)toggleSplitOrientation:(id)sender
 {
-	BOOL showingMaster = [self isShowingMaster];
+BOOL showingMaster = [self isShowingMaster];
-	if (showingMaster) {
+if (showingMaster) {
-		if (_cornerViews) {
+if (_cornerViews) {
-			for (UIView *corner in _cornerViews) {
+for (UIView *corner in _cornerViews) {
-				corner.hidden = YES;
+corner.hidden = YES;
-			}
+}
-			_dividerView.hidden = YES;
+_dividerView.hidden = YES;
-		}
+}
-		[UIView beginAnimations:MG_ANIMATION_CHANGE_SPLIT_ORIENTATION context:nil];
+[UIView beginAnimations:MG_ANIMATION_CHANGE_SPLIT_ORIENTATION context:nil];
-		[UIView setAnimationDelegate:self];
+[UIView setAnimationDelegate:self];
-		[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
+[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
-	}
+}
-	self.vertical = (!self.vertical);
+self.vertical = (!self.vertical);
-	if (showingMaster) {
+if (showingMaster) {
-		[UIView commitAnimations];
+[UIView commitAnimations];
-	}
+}
 }
 - (IBAction)toggleMasterBeforeDetail:(id)sender
 {
-	BOOL showingMaster = [self isShowingMaster];
+BOOL showingMaster = [self isShowingMaster];
-	if (showingMaster) {
+if (showingMaster) {
-		if (_cornerViews) {
+if (_cornerViews) {
-			for (UIView *corner in _cornerViews) {
+for (UIView *corner in _cornerViews) {
-				corner.hidden = YES;
+corner.hidden = YES;
-			}
+}
-			_dividerView.hidden = YES;
+_dividerView.hidden = YES;
-		}
+}
-		[UIView beginAnimations:MG_ANIMATION_CHANGE_SUBVIEWS_ORDER context:nil];
+[UIView beginAnimations:MG_ANIMATION_CHANGE_SUBVIEWS_ORDER context:nil];
-		[UIView setAnimationDelegate:self];
+[UIView setAnimationDelegate:self];
-		[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
+[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
-	}
+}
-	self.masterBeforeDetail = (!self.masterBeforeDetail);
+self.masterBeforeDetail = (!self.masterBeforeDetail);
-	if (showingMaster) {
+if (showingMaster) {
-		[UIView commitAnimations];
+[UIView commitAnimations];
-	}
+}
 }
 - (IBAction)toggleMasterView:(id)sender
 {
-	if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-		[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-	}
+}
-	if (![self isShowingMaster]) {
+if (![self isShowingMaster]) {
-		// We're about to show the master view. Ensure it's in place off-screen to be animated in.
+// We're about to show the master view. Ensure it's in place off-screen to be animated in.
-		_reconfigurePopup = YES;
+_reconfigurePopup = YES;
-		[self reconfigureForMasterInPopover:NO];
+[self reconfigureForMasterInPopover:NO];
-		[self layoutSubviews];
+[self layoutSubviews];
-	}
+}
-	// This action functions on the current primary orientation; it is independent of the other primary orientation.
+// This action functions on the current primary orientation; it is independent of the other primary orientation.
-	[UIView beginAnimations:@"toggleMaster" context:nil];
+[UIView beginAnimations:@"toggleMaster" context:nil];
-	if (self.isLandscape) {
+if (self.isLandscape) {
-		self.showsMasterInLandscape = !_showsMasterInLandscape;
+self.showsMasterInLandscape = !_showsMasterInLandscape;
-	} else {
+} else {
-		self.showsMasterInPortrait = !_showsMasterInPortrait;
+self.showsMasterInPortrait = !_showsMasterInPortrait;
-	}
+}
-	[UIView commitAnimations];
+[UIView commitAnimations];
 }
 - (IBAction)showMasterPopover:(id) sender
 {
-	if (_hiddenPopoverController && !(_hiddenPopoverController.popoverVisible)) {
+if (_hiddenPopoverController && !(_hiddenPopoverController.popoverVisible)) {
-		// Inform delegate.
+// Inform delegate.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:popoverController:willPresentViewController:)]) {
-			[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
+[(NSObject <MGSplitViewControllerDelegate> *)_delegate splitViewController:self
-																	 popoverController:_hiddenPopoverController
+popoverController:_hiddenPopoverController
-															 willPresentViewController:self.masterViewController];
+willPresentViewController:self.masterViewController];
-		}
+}
-		// Show popover.
+// Show popover.
-		[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+[_hiddenPopoverController presentPopoverFromBarButtonItem:_barButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
-	}
+}
 }
 #pragma mark -
 #pragma mark Accessors and properties
 - (id)delegate
 {
-	return _delegate;
+return _delegate;
 }
 - (void)setDelegate:(id <MGSplitViewControllerDelegate>)newDelegate
 {
-	if (newDelegate != _delegate &&
+if (newDelegate != _delegate &&
-		(!newDelegate || [(NSObject *)newDelegate conformsToProtocol:@protocol(MGSplitViewControllerDelegate)])) {
+(!newDelegate || [(NSObject *)newDelegate conformsToProtocol:@protocol(MGSplitViewControllerDelegate)])) {
-		_delegate = newDelegate;
+_delegate = newDelegate;
-	}
+}
 }
 - (BOOL)showsMasterInPortrait
 {
-	return _showsMasterInPortrait;
+return _showsMasterInPortrait;
 }
 - (void)setShowsMasterInPortrait:(BOOL)flag
 {
-	if (flag != _showsMasterInPortrait) {
+if (flag != _showsMasterInPortrait) {
-		_showsMasterInPortrait = flag;
+_showsMasterInPortrait = flag;
-		if (![self isLandscape]) { // i.e. if this will cause a visual change.
+if (![self isLandscape]) { // i.e. if this will cause a visual change.
-			if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-				[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-			}
+}
-			// Rearrange views.
+// Rearrange views.
-			_reconfigurePopup = YES;
+_reconfigurePopup = YES;
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (BOOL)showsMasterInLandscape
 {
-	return _showsMasterInLandscape;
+return _showsMasterInLandscape;
 }
 - (void)setShowsMasterInLandscape:(BOOL)flag
 {
-	if (flag != _showsMasterInLandscape) {
+if (flag != _showsMasterInLandscape) {
-		_showsMasterInLandscape = flag;
+_showsMasterInLandscape = flag;
-		if ([self isLandscape]) { // i.e. if this will cause a visual change.
+if ([self isLandscape]) { // i.e. if this will cause a visual change.
-			if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-				[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-			}
+}
-			// Rearrange views.
+// Rearrange views.
-			_reconfigurePopup = YES;
+_reconfigurePopup = YES;
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (BOOL)isVertical
 {
-	return _vertical;
+return _vertical;
 }
 - (void)setVertical:(BOOL)flag
 {
-	if (flag != _vertical) {
+if (flag != _vertical) {
-		if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-			[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-		}
+}
-		_vertical = flag;
+_vertical = flag;
-		// Inform delegate.
+// Inform delegate.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willChangeSplitOrientationToVertical:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willChangeSplitOrientationToVertical:)]) {
-			[_delegate splitViewController:self willChangeSplitOrientationToVertical:_vertical];
+[_delegate splitViewController:self willChangeSplitOrientationToVertical:_vertical];
-		}
+}
-		[self layoutSubviews];
+[self layoutSubviews];
-	}
+}
 }
 - (BOOL)isMasterBeforeDetail
 {
-	return _masterBeforeDetail;
+return _masterBeforeDetail;
 }
 - (void)setMasterBeforeDetail:(BOOL)flag
 {
-	if (flag != _masterBeforeDetail) {
+if (flag != _masterBeforeDetail) {
-		if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-			[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-		}
+}
-		_masterBeforeDetail = flag;
+_masterBeforeDetail = flag;
-		if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (float)splitPosition
 {
-	return _splitPosition;
+return _splitPosition;
 }
 - (void)setSplitPosition:(float)posn
 {
-	// Check to see if delegate wishes to constrain the position.
+// Check to see if delegate wishes to constrain the position.
-	float newPosn = posn;
+float newPosn = posn;
-	BOOL constrained = NO;
+BOOL constrained = NO;
-	CGSize fullSize = [self splitViewSizeForOrientation:self.interfaceOrientation];
+CGSize fullSize = [self splitViewSizeForOrientation:self.interfaceOrientation];
-	if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:constrainSplitPosition:splitViewSize:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:constrainSplitPosition:splitViewSize:)]) {
-		newPosn = [_delegate splitViewController:self constrainSplitPosition:newPosn splitViewSize:fullSize];
+newPosn = [_delegate splitViewController:self constrainSplitPosition:newPosn splitViewSize:fullSize];
-		constrained = YES; // implicitly trust delegate's response.
+constrained = YES; // implicitly trust delegate's response.
-	} else {
+} else {
-		// Apply default constraints if delegate doesn't wish to participate.
+// Apply default constraints if delegate doesn't wish to participate.
-		float minPos = MG_MIN_VIEW_WIDTH;
+float minPos = MG_MIN_VIEW_WIDTH;
-		float maxPos = ((_vertical) ? fullSize.width : fullSize.height) - (MG_MIN_VIEW_WIDTH + _splitWidth);
+float maxPos = ((_vertical) ? fullSize.width : fullSize.height) - (MG_MIN_VIEW_WIDTH + _splitWidth);
-		constrained = (newPosn != _splitPosition && newPosn >= minPos && newPosn <= maxPos);
+constrained = (newPosn != _splitPosition && newPosn >= minPos && newPosn <= maxPos);
-	}
+}
-	if (constrained) {
+if (constrained) {
-		if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-			[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-		}
+}
-		_splitPosition = newPosn;
+_splitPosition = newPosn;
-		// Inform delegate.
+// Inform delegate.
-		if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willMoveSplitToPosition:)]) {
+if (_delegate && [_delegate respondsToSelector:@selector(splitViewController:willMoveSplitToPosition:)]) {
-			[_delegate splitViewController:self willMoveSplitToPosition:_splitPosition];
+[_delegate splitViewController:self willMoveSplitToPosition:_splitPosition];
-		}
+}
-		if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (void)setSplitPosition:(float)posn animated:(BOOL)animate
 {
-	BOOL shouldAnimate = (animate && [self isShowingMaster]);
+BOOL shouldAnimate = (animate && [self isShowingMaster]);
-	if (shouldAnimate) {
+if (shouldAnimate) {
-		[UIView beginAnimations:@"SplitPosition" context:nil];
+[UIView beginAnimations:@"SplitPosition" context:nil];
-	}
+}
-	[self setSplitPosition:posn];
+[self setSplitPosition:posn];
-	if (shouldAnimate) {
+if (shouldAnimate) {
-		[UIView commitAnimations];
+[UIView commitAnimations];
-	}
+}
 }
 - (float)splitWidth
 {
-	return _splitWidth;
+return _splitWidth;
 }
 - (void)setSplitWidth:(float)width
 {
-	if (width != _splitWidth && width >= 0) {
+if (width != _splitWidth && width >= 0) {
-		_splitWidth = width;
+_splitWidth = width;
-		if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (NSArray *)viewControllers
 {
-	return [[_viewControllers copy] autorelease];
+return [[_viewControllers copy] autorelease];
 }
 - (void)setViewControllers:(NSArray *)controllers
 {
-	if (controllers != _viewControllers) {
+if (controllers != _viewControllers) {
-		for (UIViewController *controller in _viewControllers) {
+for (UIViewController *controller in _viewControllers) {
-			if ([controller isKindOfClass:[UIViewController class]]) {
+if ([controller isKindOfClass:[UIViewController class]]) {
-				[controller.view removeFromSuperview];
+[controller.view removeFromSuperview];
-			}
+}
-		}
+}
-		[_viewControllers release];
+[_viewControllers release];
-		_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
+_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
-		if (controllers && [controllers count] >= 2) {
+if (controllers && [controllers count] >= 2) {
-			self.masterViewController = [controllers objectAtIndex:0];
+self.masterViewController = [controllers objectAtIndex:0];
-			self.detailViewController = [controllers objectAtIndex:1];
+self.detailViewController = [controllers objectAtIndex:1];
-		} else {
+} else {
-			NSLog(@"Error: %@ requires 2 view-controllers. (%@)", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
+NSLog(@"Error: %@ requires 2 view-controllers. (%@)", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
-		}
+}
-		[self layoutSubviews];
+[self layoutSubviews];
-	}
+}
 }
 - (UIViewController *)masterViewController
 {
-	if (_viewControllers && [_viewControllers count] > 0) {
+if (_viewControllers && [_viewControllers count] > 0) {
-		NSObject *controller = [_viewControllers objectAtIndex:0];
+NSObject *controller = [_viewControllers objectAtIndex:0];
-		if ([controller isKindOfClass:[UIViewController class]]) {
+if ([controller isKindOfClass:[UIViewController class]]) {
-			return [[controller retain] autorelease];
+return [[controller retain] autorelease];
-		}
+}
-	}
+}
-	return nil;
+return nil;
 }
 - (void)setMasterViewController:(UIViewController *)master
 {
-	if (!_viewControllers) {
+if (!_viewControllers) {
-		_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
+_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
-	}
+}
-	NSObject *newMaster = master;
+NSObject *newMaster = master;
-	if (!newMaster) {
+if (!newMaster) {
-		newMaster = [NSNull null];
+newMaster = [NSNull null];
-	}
+}
-	BOOL changed = YES;
+BOOL changed = YES;
-	if ([_viewControllers count] > 0) {
+if ([_viewControllers count] > 0) {
-		if ([_viewControllers objectAtIndex:0] == newMaster) {
+if ([_viewControllers objectAtIndex:0] == newMaster) {
-			changed = NO;
+changed = NO;
-		} else {
+} else {
-			[_viewControllers replaceObjectAtIndex:0 withObject:newMaster];
+[_viewControllers replaceObjectAtIndex:0 withObject:newMaster];
-		}
+}
-	} else {
+} else {
-		[_viewControllers addObject:newMaster];
+[_viewControllers addObject:newMaster];
-	}
+}
-	if (changed) {
+if (changed) {
-		[self layoutSubviews];
+[self layoutSubviews];
-	}
+}
 }
 - (UIViewController *)detailViewController
 {
-	if (_viewControllers && [_viewControllers count] > 1) {
+if (_viewControllers && [_viewControllers count] > 1) {
-		NSObject *controller = [_viewControllers objectAtIndex:1];
+NSObject *controller = [_viewControllers objectAtIndex:1];
-		if ([controller isKindOfClass:[UIViewController class]]) {
+if ([controller isKindOfClass:[UIViewController class]]) {
-			return [[controller retain] autorelease];
+return [[controller retain] autorelease];
-		}
+}
-	}
+}
-	return nil;
+return nil;
 }
 - (void)setDetailViewController:(UIViewController *)detail
 {
-	if (!_viewControllers) {
+if (!_viewControllers) {
-		_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
+_viewControllers = [[NSMutableArray alloc] initWithCapacity:2];
-		[_viewControllers addObject:[NSNull null]];
+[_viewControllers addObject:[NSNull null]];
-	}
+}
-	BOOL changed = YES;
+BOOL changed = YES;
-	if ([_viewControllers count] > 1) {
+if ([_viewControllers count] > 1) {
-		if ([_viewControllers objectAtIndex:1] == detail) {
+if ([_viewControllers objectAtIndex:1] == detail) {
-			changed = NO;
+changed = NO;
-		} else {
+} else {
-			[_viewControllers replaceObjectAtIndex:1 withObject:detail];
+[_viewControllers replaceObjectAtIndex:1 withObject:detail];
-		}
+}
-	} else {
+} else {
-		[_viewControllers addObject:detail];
+[_viewControllers addObject:detail];
-	}
+}
-	if (changed) {
+if (changed) {
-		[self layoutSubviews];
+[self layoutSubviews];
-	}
+}
 }
 - (MGSplitDividerView *)dividerView
 {
-	return [[_dividerView retain] autorelease];
+return [[_dividerView retain] autorelease];
 }
 - (void)setDividerView:(MGSplitDividerView *)divider
 {
-	if (divider != _dividerView) {
+if (divider != _dividerView) {
-		[_dividerView removeFromSuperview];
+[_dividerView removeFromSuperview];
-		[_dividerView release];
+[_dividerView release];
-		_dividerView = [divider retain];
+_dividerView = [divider retain];
-		_dividerView.splitViewController = self;
+_dividerView.splitViewController = self;
-		_dividerView.backgroundColor = MG_DEFAULT_CORNER_COLOR;
+_dividerView.backgroundColor = MG_DEFAULT_CORNER_COLOR;
-		if ([self isShowingMaster]) {
+if ([self isShowingMaster]) {
-			[self layoutSubviews];
+[self layoutSubviews];
-		}
+}
-	}
+}
 }
 - (BOOL)allowsDraggingDivider
 {
-	if (_dividerView) {
+if (_dividerView) {
-		return _dividerView.allowsDragging;
+return _dividerView.allowsDragging;
-	}
+}
-	return NO;
+return NO;
 }
 - (void)setAllowsDraggingDivider:(BOOL)flag
 {
-	if (self.allowsDraggingDivider != flag && _dividerView) {
+if (self.allowsDraggingDivider != flag && _dividerView) {
-		_dividerView.allowsDragging = flag;
+_dividerView.allowsDragging = flag;
-	}
+}
 }
 - (MGSplitViewDividerStyle)dividerStyle
 {
-	return _dividerStyle;
+return _dividerStyle;
 }
 - (void)setDividerStyle:(MGSplitViewDividerStyle)newStyle
 {
-	if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
+if (_hiddenPopoverController && _hiddenPopoverController.popoverVisible) {
-		[_hiddenPopoverController dismissPopoverAnimated:NO];
+[_hiddenPopoverController dismissPopoverAnimated:NO];
-	}
+}
-	// We don't check to see if newStyle equals _dividerStyle, because it's a meta-setting.
+// We don't check to see if newStyle equals _dividerStyle, because it's a meta-setting.
-	// Aspects could have been changed since it was set.
+// Aspects could have been changed since it was set.
-	_dividerStyle = newStyle;
+_dividerStyle = newStyle;
-	// Reconfigure general appearance and behaviour.
+// Reconfigure general appearance and behaviour.
-	float cornerRadius;
+float cornerRadius;
-	if (_dividerStyle == MGSplitViewDividerStyleThin) {
+if (_dividerStyle == MGSplitViewDividerStyleThin) {
-		cornerRadius = MG_DEFAULT_CORNER_RADIUS;
+cornerRadius = MG_DEFAULT_CORNER_RADIUS;
-		_splitWidth = MG_DEFAULT_SPLIT_WIDTH;
+_splitWidth = MG_DEFAULT_SPLIT_WIDTH;
-		self.allowsDraggingDivider = NO;
+self.allowsDraggingDivider = NO;
-	} else if (_dividerStyle == MGSplitViewDividerStylePaneSplitter) {
+} else if (_dividerStyle == MGSplitViewDividerStylePaneSplitter) {
-		cornerRadius = MG_PANESPLITTER_CORNER_RADIUS;
+cornerRadius = MG_PANESPLITTER_CORNER_RADIUS;
-		_splitWidth = MG_PANESPLITTER_SPLIT_WIDTH;
+_splitWidth = MG_PANESPLITTER_SPLIT_WIDTH;
-		self.allowsDraggingDivider = YES;
+self.allowsDraggingDivider = YES;
-	}
+}
-	// Update divider and corners.
+// Update divider and corners.
-	[_dividerView setNeedsDisplay];
+[_dividerView setNeedsDisplay];
-	if (_cornerViews) {
+if (_cornerViews) {
-		for (MGSplitCornersView *corner in _cornerViews) {
+for (MGSplitCornersView *corner in _cornerViews) {
-			corner.cornerRadius = cornerRadius;
+corner.cornerRadius = cornerRadius;
-		}
+}
-	}
+}
-	// Layout all views.
+// Layout all views.
-	[self layoutSubviews];
+[self layoutSubviews];
 }
 - (void)setDividerStyle:(MGSplitViewDividerStyle)newStyle animated:(BOOL)animate
 {
-	BOOL shouldAnimate = (animate && [self isShowingMaster]);
+BOOL shouldAnimate = (animate && [self isShowingMaster]);
-	if (shouldAnimate) {
+if (shouldAnimate) {
-		[UIView beginAnimations:@"DividerStyle" context:nil];
+[UIView beginAnimations:@"DividerStyle" context:nil];
-	}
+}
-	[self setDividerStyle:newStyle];
+[self setDividerStyle:newStyle];
-	if (shouldAnimate) {
+if (shouldAnimate) {
-		[UIView commitAnimations];
+[UIView commitAnimations];
-	}
+}
 }
 - (NSArray *)cornerViews
 {
-	if (_cornerViews) {
+if (_cornerViews) {
-		return [[_cornerViews retain] autorelease];
+return [[_cornerViews retain] autorelease];
-	}
+}
-	return nil;
+return nil;
 }
 @synthesize showsMasterInPortrait;
 @synthesize showsMasterInLandscape;

changeset 8441	a00b0fa0dbd7
parent 6908	896ed2afcfb8
child 11115	3729ac42189b