Skip to content

added method shouldShowMenuViewController in RESideMenuDelegate #285

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
marcovisona wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added method shouldShowMenuViewController in RESideMenuDelegate #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9762d5e
added method shouldShowMenuViewController in RESideMenuDelegate
Apr 13, 2016
f635f3c
method shouldShowMenuViewController in RESideMenuDelegate made optional
Apr 13, 2016
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
1 change: 1 addition & 0 deletions RESideMenu/RESideMenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
@protocol RESideMenuDelegate <NSObject>

@optional
- (BOOL)sideMenu:(RESideMenu *)sideMenu shouldShowMenuViewController:(UIViewController *)menuViewController;
- (void)sideMenu:(RESideMenu *)sideMenu didRecognizePanGesture:(UIPanGestureRecognizer *)recognizer;
- (void)sideMenu:(RESideMenu *)sideMenu willShowMenuViewController:(UIViewController *)menuViewController;
- (void)sideMenu:(RESideMenu *)sideMenu didShowMenuViewController:(UIViewController *)menuViewController;
Expand Down
18 changes: 18 additions & 0 deletions RESideMenu/RESideMenu.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ - (void)viewDidLoad

- (void)presentMenuViewContainerWithMenuViewController:(UIViewController *)menuViewController
{
if ([self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:shouldShowMenuViewController:)]){
if(! [self.delegate sideMenu:self shouldShowMenuViewController:self.leftMenuViewController]){
return;
}
}

self.menuViewContainer.transform = CGAffineTransformIdentity;
if (self.scaleBackgroundImageView) {
self.backgroundImageView.transform = CGAffineTransformIdentity;
Expand Down Expand Up @@ -552,6 +558,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive

- (void)panGestureRecognized:(UIPanGestureRecognizer *)recognizer
{

if ([self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:didRecognizePanGesture:)])
[self.delegate sideMenu:self didRecognizePanGesture:recognizer];

Expand All @@ -560,6 +567,17 @@ - (void)panGestureRecognized:(UIPanGestureRecognizer *)recognizer
}

CGPoint point = [recognizer translationInView:self.view];
if ([self.delegate conformsToProtocol:@protocol(RESideMenuDelegate)] && [self.delegate respondsToSelector:@selector(sideMenu:shouldShowMenuViewController:)]){
if (point.x > 0) {
if(! [self.delegate sideMenu:self shouldShowMenuViewController:self.leftMenuViewController]){
return;
}
} else {
if(! [self.delegate sideMenu:self shouldShowMenuViewController:self.rightMenuViewController]){
return;
}
}
}

if (recognizer.state == UIGestureRecognizerStateBegan) {
[self updateContentViewShadow];
Expand Down