Modified MGSplitViewController.m

.gitignore

@@ -1,4 +1,42 @@
-*.pbxuser
-*.perspectivev3
-build
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.a
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Specific files #
+##################
+*.app
+*.octest
+xcuserdata
 

Classes/DetailViewController.m

@@ -60,22 +60,22 @@ - (void)configureView
 #pragma mark Split view support
 
 
-- (void)splitViewController:(MGSplitViewController*)svc 
-	 willHideViewController:(UIViewController *)aViewController 
-		  withBarButtonItem:(UIBarButtonItem*)barButtonItem 
-	   forPopoverController: (UIPopoverController*)pc
-{
-	//NSLog(@"%@", NSStringFromSelector(_cmd));
-
-	if (barButtonItem) {
-		barButtonItem.title = @"Popover";
-		NSMutableArray *items = [[toolbar items] mutableCopy];
-		[items insertObject:barButtonItem atIndex:0];
-		[toolbar setItems:items animated:YES];
-		[items release];
-	}
-    self.popoverController = pc;
-}
+//- (void)splitViewController:(MGSplitViewController*)svc 
+//	 willHideViewController:(UIViewController *)aViewController 
+//		  withBarButtonItem:(UIBarButtonItem*)barButtonItem 
+//	   forPopoverController: (UIPopoverController*)pc
+//{
+//	//NSLog(@"%@", NSStringFromSelector(_cmd));
+//	
+//	if (barButtonItem) {
+//		barButtonItem.title = @"Popover";
+//		NSMutableArray *items = [[toolbar items] mutableCopy];
+//		[items insertObject:barButtonItem atIndex:0];
+//		[toolbar setItems:items animated:YES];
+//		[items release];
+//	}
+//    self.popoverController = pc;
+//}
 
 
 // Called when the view is shown again in the split view, invalidating the button and popover controller.

Classes/MGSplitViewController.h

@@ -16,7 +16,7 @@ typedef enum _MGSplitViewDividerStyle {
 
 @class MGSplitDividerView;
 @protocol MGSplitViewControllerDelegate;
-@interface MGSplitViewController : UIViewController <UIPopoverControllerDelegate> {
+@interface MGSplitViewController : UIViewController  {
 	BOOL _showsMasterInPortrait;
 	BOOL _showsMasterInLandscape;
 	float _splitWidth;
@@ -25,12 +25,11 @@ typedef enum _MGSplitViewDividerStyle {
 	BOOL _masterBeforeDetail;
 	NSMutableArray *_viewControllers;
 	UIBarButtonItem *_barButtonItem; // To be compliant with wacky UISplitViewController behaviour.
-    UIPopoverController *_hiddenPopoverController; // Popover used to hold the master view if it's not always visible.
 	MGSplitDividerView *_dividerView; // View that draws the divider between the master and detail views.
 	NSArray *_cornerViews; // Views to draw the inner rounded corners between master and detail views.
 	float _splitPosition;
-	BOOL _reconfigurePopup;
 	MGSplitViewDividerStyle _dividerStyle; // Meta-setting which configures several aspects of appearance and behaviour.
+	BOOL _supportPortait;
 }
 
 @property (nonatomic, assign) IBOutlet id <MGSplitViewControllerDelegate> delegate;
@@ -50,12 +49,12 @@ typedef enum _MGSplitViewDividerStyle {
 
 @property (nonatomic, readonly, getter=isLandscape) BOOL landscape; // returns YES if this view controller is in either of the two Landscape orientations, else NO.
 
+@property (nonatomic, assign) BOOL supportPortrait;
+
 // Actions
 - (IBAction)toggleSplitOrientation:(id)sender; // toggles split axis between vertical (left/right; default) and horizontal (top/bottom).
 - (IBAction)toggleMasterBeforeDetail:(id)sender; // toggles position of master view relative to detail view.
 - (IBAction)toggleMasterView:(id)sender; // toggles display of the master view in the current orientation.
-- (IBAction)showMasterPopover:(id)sender; // shows the master view in a popover spawned from the provided barButtonItem, if it's currently hidden.
-- (void)notePopoverDismissed; // should rarely be needed, because you should not change the popover's delegate. If you must, then call this when it's dismissed.
 
 // Conveniences for you, because I care.
 - (BOOL)isShowingMaster;
@@ -80,6 +79,9 @@ typedef enum _MGSplitViewDividerStyle {
 	2. Change their .cornerRadius
  */
 
+
+- (void)callLayoutSubviewManually;
+
 @end
 
 
@@ -88,10 +90,10 @@ typedef enum _MGSplitViewDividerStyle {
 @optional
 
 // Called when a button should be added to a toolbar for a hidden view controller.
-- (void)splitViewController:(MGSplitViewController*)svc 
-	 willHideViewController:(UIViewController *)aViewController 
-		  withBarButtonItem:(UIBarButtonItem*)barButtonItem 
-	   forPopoverController: (UIPopoverController*)pc;
+//- (void)splitViewController:(MGSplitViewController*)svc 
+//	 willHideViewController:(UIViewController *)aViewController 
+//		  withBarButtonItem:(UIBarButtonItem*)barButtonItem 
+//	   forPopoverController: (UIPopoverController*)pc;
 
 // Called when the master view is shown again in the split view, invalidating the button and popover controller.
 - (void)splitViewController:(MGSplitViewController*)svc