Skip to content

Commit 88d9b88

Browse files
committed
Add another menu item. Transitions must set initial frame
1 parent fcee3d7 commit 88d9b88

13 files changed

+373
-101
lines changed

ECSlidingViewController/ECSlidingAnimationController.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
4141
UIViewController *topViewController = [transitionContext viewControllerForKey:ECTransitionContextTopViewControllerKey];
4242
UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
4343
UIView *containerView = [transitionContext containerView];
44+
CGRect topViewInitialFrame = [transitionContext initialFrameForViewController:topViewController];
4445
CGRect topViewFinalFrame = [transitionContext finalFrameForViewController:topViewController];
4546

47+
topViewController.view.frame = topViewInitialFrame;
48+
4649
if (topViewController != toViewController) {
4750
CGRect toViewInitialFrame = [transitionContext initialFrameForViewController:toViewController];
4851
toViewController.view.frame = toViewInitialFrame;

ECSlidingViewController/ECSlidingViewController.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ - (void)setTopViewController:(UIViewController *)topViewController {
258258

259259
if ([self isViewLoaded]) {
260260
[_topViewController beginAppearanceTransition:YES animated:NO];
261-
_topViewController.view.frame = [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
262261
[self.view addSubview:_topViewController.view];
263262
[_topViewController endAppearanceTransition];
264263
}

Examples/TransitionFun/TransitionFun.xcodeproj/project.pbxproj

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
05160F581820CDF300EA3BDD /* MEZoomAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 05160F571820CDF300EA3BDD /* MEZoomAnimationController.m */; };
11-
0526990E182F37CE00285190 /* Main-iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0526990D182F37CE00285190 /* Main-iPad.storyboard */; };
1211
05629E92181F4DA200A88F6C /* MEFoldAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 05629E91181F4DA200A88F6C /* MEFoldAnimationController.m */; };
12+
056599E518454CB400B9C16B /* MESettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 056599E418454CB400B9C16B /* MESettingsViewController.m */; };
13+
056599E818458A1D00B9C16B /* Main-iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 056599E618458A1D00B9C16B /* Main-iPad.storyboard */; };
1314
057DC25C181DE6AE00D15995 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 057DC25B181DE6AE00D15995 /* Foundation.framework */; };
1415
057DC25E181DE6AE00D15995 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 057DC25D181DE6AE00D15995 /* CoreGraphics.framework */; };
1516
057DC260181DE6AE00D15995 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 057DC25F181DE6AE00D15995 /* UIKit.framework */; };
@@ -28,9 +29,11 @@
2829
/* Begin PBXFileReference section */
2930
05160F561820CDF300EA3BDD /* MEZoomAnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEZoomAnimationController.h; sourceTree = "<group>"; };
3031
05160F571820CDF300EA3BDD /* MEZoomAnimationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEZoomAnimationController.m; sourceTree = "<group>"; };
31-
0526990D182F37CE00285190 /* Main-iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Main-iPad.storyboard"; sourceTree = "<group>"; };
3232
05629E90181F4DA200A88F6C /* MEFoldAnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEFoldAnimationController.h; sourceTree = "<group>"; };
3333
05629E91181F4DA200A88F6C /* MEFoldAnimationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEFoldAnimationController.m; sourceTree = "<group>"; };
34+
056599E318454CB400B9C16B /* MESettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MESettingsViewController.h; sourceTree = "<group>"; };
35+
056599E418454CB400B9C16B /* MESettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MESettingsViewController.m; sourceTree = "<group>"; };
36+
056599E718458A1D00B9C16B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = "Base.lproj/Main-iPad.storyboard"; sourceTree = "<group>"; };
3437
057DC258181DE6AE00D15995 /* TransitionFun.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TransitionFun.app; sourceTree = BUILT_PRODUCTS_DIR; };
3538
057DC25B181DE6AE00D15995 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
3639
057DC25D181DE6AE00D15995 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -118,12 +121,14 @@
118121
isa = PBXGroup;
119122
children = (
120123
057DC273181DE6AE00D15995 /* Images.xcassets */,
121-
0526990D182F37CE00285190 /* Main-iPad.storyboard */,
124+
056599E618458A1D00B9C16B /* Main-iPad.storyboard */,
122125
057DC26D181DE6AE00D15995 /* Main.storyboard */,
123126
057DC26A181DE6AE00D15995 /* MEAppDelegate.h */,
124127
057DC26B181DE6AE00D15995 /* MEAppDelegate.m */,
125128
057DC2A4181DF4F500D15995 /* MEMenuViewController.h */,
126129
057DC2A5181DF4F500D15995 /* MEMenuViewController.m */,
130+
056599E318454CB400B9C16B /* MESettingsViewController.h */,
131+
056599E418454CB400B9C16B /* MESettingsViewController.m */,
127132
05CBD180182DF3B200118119 /* METransitions.h */,
128133
05CBD181182DF3B200118119 /* METransitions.m */,
129134
057DC2A1181DEE4700D15995 /* METransitionsViewController.h */,
@@ -203,7 +208,7 @@
203208
057DC274181DE6AE00D15995 /* Images.xcassets in Resources */,
204209
057DC266181DE6AE00D15995 /* InfoPlist.strings in Resources */,
205210
057DC26F181DE6AE00D15995 /* Main.storyboard in Resources */,
206-
0526990E182F37CE00285190 /* Main-iPad.storyboard in Resources */,
211+
056599E818458A1D00B9C16B /* Main-iPad.storyboard in Resources */,
207212
);
208213
runOnlyForDeploymentPostprocessing = 0;
209214
};
@@ -255,12 +260,21 @@
255260
057DC2A6181DF4F500D15995 /* MEMenuViewController.m in Sources */,
256261
05160F581820CDF300EA3BDD /* MEZoomAnimationController.m in Sources */,
257262
057DC2A3181DEE4700D15995 /* METransitionsViewController.m in Sources */,
263+
056599E518454CB400B9C16B /* MESettingsViewController.m in Sources */,
258264
);
259265
runOnlyForDeploymentPostprocessing = 0;
260266
};
261267
/* End PBXSourcesBuildPhase section */
262268

263269
/* Begin PBXVariantGroup section */
270+
056599E618458A1D00B9C16B /* Main-iPad.storyboard */ = {
271+
isa = PBXVariantGroup;
272+
children = (
273+
056599E718458A1D00B9C16B /* Base */,
274+
);
275+
name = "Main-iPad.storyboard";
276+
sourceTree = "<group>";
277+
};
264278
057DC264181DE6AE00D15995 /* InfoPlist.strings */ = {
265279
isa = PBXVariantGroup;
266280
children = (

0 commit comments

Comments
 (0)