Merge pull request mutualmobile#163 from antonholmquist/original

Fixed incorrect rect conversion
yzhfd · Jan 28, 2014 · b12cedf · b12cedf
2 parents 327e049 + 546f029
commit b12cedf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/MMDrawerController/MMDrawerController.m b/MMDrawerController/MMDrawerController.m
@@ -92,7 +92,7 @@ -(UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event{
     if(hitView &&
        self.openSide != MMDrawerSideNone){
         UINavigationBar * navBar = [self navigationBarContainedWithinSubviewsOfView:self];
-        CGRect navBarFrame = [navBar convertRect:navBar.frame toView:self];
+        CGRect navBarFrame = [navBar convertRect:navBar.bounds toView:self];
         if((self.centerInteractionMode == MMDrawerOpenCenterInteractionModeNavigationBarOnly &&
            CGRectContainsPoint(navBarFrame, point) == NO) ||
            self.centerInteractionMode == MMDrawerOpenCenterInteractionModeNone){
@@ -1286,7 +1286,7 @@ -(BOOL)isPointContainedWithinNavigationRect:(CGPoint)point{
     CGRect navigationBarRect = CGRectNull;
     if([self.centerViewController isKindOfClass:[UINavigationController class]]){
         UINavigationBar * navBar = [(UINavigationController*)self.centerViewController navigationBar];
-        navigationBarRect = [navBar convertRect:navBar.frame toView:self.childControllerContainerView];
+        navigationBarRect = [navBar convertRect:navBar.bounds toView:self.childControllerContainerView];
         navigationBarRect = CGRectIntersection(navigationBarRect,self.childControllerContainerView.bounds);
     }
     return CGRectContainsPoint(navigationBarRect,point);