diff --git a/.gitignore b/.gitignore index 5eb0261..9509fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ MPFoldTransition.xcodeproj/xcuserdata/mark.xcuserdatad/xcschemes/MPFoldTransitio MPFoldTransition.xcodeproj/project.xcworkspace/xcuserdata/mark.xcuserdatad/WorkspaceSettings.xcsettings MPFoldTransition.xcodeproj/xcuserdata/mark.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist + +MPFoldTransition.xcodeproj/project.xcworkspace/xcshareddata/MPFoldTransition.xccheckout diff --git a/MPFoldTransition/MPFoldTransition/MPTransition.m b/MPFoldTransition/MPFoldTransition/MPTransition.m index 6e949e9..e1b616a 100644 --- a/MPFoldTransition/MPFoldTransition/MPTransition.m +++ b/MPFoldTransition/MPFoldTransition/MPTransition.m @@ -110,7 +110,7 @@ - (void)setPresentingController:(UIViewController *)presentingController } [self setSourceView:src.view]; - if ([src wantsFullScreenLayout]) + if ([src wantsFullScreenLayout] && NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_6_1) { // don't include the status bar height in the rect to fold CGRect frame = src.view.frame; @@ -122,6 +122,10 @@ - (void)setPresentingController:(UIViewController *)presentingController frameViewRect.size.height -= statusBarViewRect.size.height; [self setRect:frameViewRect]; } + else + { + [self setRect:src.view.bounds]; + } } - (void)setPresentedController:(UIViewController *)presentedController; diff --git a/MPFoldTransition/en.lproj/MainStoryboard_iPad.storyboard b/MPFoldTransition/en.lproj/MainStoryboard_iPad.storyboard index cc844a2..3068891 100644 --- a/MPFoldTransition/en.lproj/MainStoryboard_iPad.storyboard +++ b/MPFoldTransition/en.lproj/MainStoryboard_iPad.storyboard @@ -1,15 +1,13 @@ - + - - - + + - @@ -18,16 +16,16 @@ + - - - + + @@ -36,7 +34,7 @@ - + @@ -48,13 +46,12 @@ - - + - + @@ -66,8 +63,7 @@ - - + @@ -76,7 +72,7 @@ - + @@ -88,13 +84,12 @@ - - + - + @@ -106,8 +101,7 @@ - - + @@ -116,7 +110,7 @@ - + @@ -128,13 +122,12 @@ - - + - + @@ -146,8 +139,7 @@ - - + @@ -161,16 +153,16 @@ + - - - + + @@ -179,7 +171,7 @@ - + @@ -191,13 +183,12 @@ - - + - + @@ -209,8 +200,7 @@ - - + @@ -219,7 +209,7 @@ - + @@ -231,13 +221,12 @@ - - + - + @@ -249,8 +238,7 @@ - - + @@ -259,7 +247,7 @@ - + @@ -271,13 +259,12 @@ - - + - + @@ -289,8 +276,7 @@ - - + @@ -304,13 +290,13 @@ + - @@ -321,7 +307,7 @@ - + @@ -347,14 +333,14 @@