Skip to content

Commit 3a50161

Browse files
committed
Demo: Fix panning on SideView, hide Sideview when settings is selected
Summary: See http://codereview.cc/D93 Reviewers: #material_components_ios_owners, junius Reviewed By: #material_components_ios_owners, junius Projects: #material_components_ios Differential Revision: http://codereview.cc/D94
1 parent b78ccf7 commit 3a50161

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

demos/Pesto/Pesto/PestoSideView.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
275275

276276
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
277277
shouldReceiveTouch:(UITouch *)touch {
278-
return [gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] &&
279-
![touch.view isDescendantOfView:_contentView];
278+
if ([touch.view isDescendantOfView:_contentView]) {
279+
return ![gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]];
280+
}
281+
return YES;
280282
}
281283

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

demos/Pesto/Pesto/PestoViewController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ - (void)sideViewDidSelectSettings:(PestoSideView *)sideView {
466466
navVC.navigationBar.barTintColor = headerColor;
467467
navVC.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName : white};
468468
navVC.navigationBar.translucent = NO;
469+
470+
[sideView hideSideView];
469471
[self presentViewController:navVC animated:YES completion:nil];
470472
}
471473

0 commit comments

Comments
 (0)