Skip to content

Respect content size in popViewControllerAnimated #63

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

Open
tomhamming wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect content size in popViewControllerAnimated #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 33 additions & 0 deletions WYPopoverController/WYPopoverController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ + (void)load {
swizzle = class_getInstanceMethod(self, @selector(sizzled_setViewControllers:animated:));

method_exchangeImplementations(original, swizzle);

original = class_getInstanceMethod(self, @selector(popViewControllerAnimated:));
swizzle = class_getInstanceMethod(self, @selector(sizzled_popViewControllerAnimated:));

method_exchangeImplementations(original, swizzle);
}

- (BOOL)wy_isEmbedInPopover {
Expand Down Expand Up @@ -268,6 +273,34 @@ - (void)sizzled_pushViewController:(UIViewController *)aViewController animated:
}
}

-(void)sizzled_popViewControllerAnimated:(BOOL)animated
{
if(self.viewControllers.count <= 1)
{
//Let the system handle the special case
[self sizzled_popViewControllerAnimated:animated];
return;
}

UIViewController *vc = [self.viewControllers objectAtIndex:self.viewControllers.count - 2];
if (self.wy_isEmbedInPopover) {
#ifdef WY_BASE_SDK_7_ENABLED
if ([vc respondsToSelector:@selector(setEdgesForExtendedLayout:)]) {
vc.edgesForExtendedLayout = UIRectEdgeNone;
}
#endif
CGSize contentSize = [self contentSize:vc];
[self setContentSize:contentSize];
}

[self sizzled_popViewControllerAnimated:animated];

if (self.wy_isEmbedInPopover) {
CGSize contentSize = [self contentSize:vc];
[self setContentSize:contentSize];
}
}

- (void)sizzled_setViewControllers:(NSArray *)aViewControllers animated:(BOOL)aAnimated {
NSUInteger count = [aViewControllers count];

Expand Down