fix popover content size when used with an uinavigationcontroller on ios7

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -34,6 +34,7 @@
 #endif
 
 typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
+    WYPopoverArrowDirectionNone = 0,
     WYPopoverArrowDirectionUp = 1UL << 0,
     WYPopoverArrowDirectionDown = 1UL << 1,
     WYPopoverArrowDirectionLeft = 1UL << 2,

WYPopoverController/WYPopoverController.m

@@ -1009,6 +1009,22 @@ - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context
 
         reducedOuterCornerRadius = MIN(reducedOuterCornerRadius, outerCornerRadius);
 
+        if (arrowDirection == WYPopoverArrowDirectionNone)
+        {
+            origin = CGPointMake(CGRectGetMidX(outerRect), CGRectGetMinY(outerRect));
+            
+            CGPathMoveToPoint(outerPathRef, NULL, origin.x, origin.y);
+            
+            CGPathAddLineToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect) - outerCornerRadius, CGRectGetMinY(outerRect));
+            
+            CGPathAddArcToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect), CGRectGetMinY(outerRect), CGRectGetMaxX(outerRect), CGRectGetMaxY(outerRect), outerCornerRadius);
+            CGPathAddArcToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect), CGRectGetMaxY(outerRect), CGRectGetMinX(outerRect), CGRectGetMaxY(outerRect), outerCornerRadius);
+            CGPathAddArcToPoint(outerPathRef, NULL, CGRectGetMinX(outerRect), CGRectGetMaxY(outerRect), CGRectGetMinX(outerRect), CGRectGetMinY(outerRect), outerCornerRadius);
+            CGPathAddArcToPoint(outerPathRef, NULL, CGRectGetMinX(outerRect), CGRectGetMinY(outerRect), CGRectGetMaxX(outerRect), CGRectGetMinY(outerRect), outerCornerRadius);
+            
+            CGPathAddLineToPoint(outerPathRef, NULL, origin.x, origin.y);
+        }
+        
         if (arrowDirection == WYPopoverArrowDirectionUp)
         {
             origin = CGPointMake(CGRectGetMidX(outerRect) + arrowOffset - arrowBase / 2, CGRectGetMinY(outerRect));
@@ -1214,7 +1230,7 @@ - (CGRect)arrowRect:(CGRect)rect arrowDirection:(WYPopoverArrowDirection)aArrowD
 {
     CGRect result = CGRectZero;
 
-    if (arrowHeight > 0)
+    if (arrowHeight > 0 && aArrowDirection != WYPopoverArrowDirectionDown)
     {
         result.size = CGSizeMake(arrowBase, arrowHeight);
 
@@ -1414,17 +1430,27 @@ - (CGSize)contentSizeForViewInPopover
 {
     CGSize result = CGSizeZero;
 
+    UIViewController *controller = viewController;
+    
+    UINavigationController *navigationController = (UINavigationController *)controller;
+    if ([[navigationController viewControllers] count] > 0)
+    {
+        controller = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];
+    }
+    
 #ifdef WY_BASE_SDK_7_ENABLED
-    if ([viewController respondsToSelector:@selector(preferredContentSize)])
+    if ([controller respondsToSelector:@selector(preferredContentSize)])
     {
-        result = viewController.preferredContentSize;
+        result = controller.preferredContentSize;
     }
 #endif
+    
     if (CGSizeEqualToSize(result, CGSizeZero))
     {
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-        result = viewController.contentSizeForViewInPopover;
+        
+        result = controller.contentSizeForViewInPopover;
 #pragma clang diagnostic pop
     }
 
@@ -1604,7 +1630,7 @@ - (void)positionPopover
 
     overlayView.frame = self.rootView.bounds;
 
-    viewFrame = [overlayView convertRect:rect fromView:inView];
+    viewFrame = (permittedArrowDirections != WYPopoverArrowDirectionNone) ? [overlayView convertRect:rect fromView:inView] : overlayView.bounds;
 
     minX = popoverLayoutMargins.left;
     maxX = self.rootView.bounds.size.width - popoverLayoutMargins.right;
@@ -1821,6 +1847,24 @@ - (void)positionPopover
         containerView.arrowOffset = offset;
     }
 
+    if (arrowDirection == WYPopoverArrowDirectionNone)
+    {
+        containerView.arrowDirection = WYPopoverArrowDirectionNone;
+        containerViewSize = [containerView sizeThatFits:contentViewSize];
+        
+        containerFrame = CGRectZero;
+        containerFrame.size = containerViewSize;
+        containerFrame.size.width = MIN(maxX - minX, containerFrame.size.width);
+        containerFrame.size.height = MIN(maxY - minY, containerFrame.size.height);
+        containerView.frame = containerFrame;
+        
+        containerView.center = CGPointMake(viewFrame.size.width / 2, viewFrame.size.height / 2);
+        
+        containerFrame = containerView.frame;
+        
+        containerView.arrowOffset = 0;
+    }
+    
     containerView.frame = containerFrame;
 
     containerView.wantsDefaultContentAppearance = wantsDefaultContentAppearance;
@@ -1931,8 +1975,13 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
 {
     WYPopoverArrowDirection arrowDirection = WYPopoverArrowDirectionUnknown;
 
-    NSMutableArray* areas = [NSMutableArray arrayWithCapacity:0];
-    WYPopoverArea* area;
+    if (arrowDirections == WYPopoverArrowDirectionNone)
+    {
+        arrowDirection = WYPopoverArrowDirectionNone;
+    }
+    
+    NSMutableArray *areas = [NSMutableArray arrayWithCapacity:0];
+    WYPopoverArea *area;
 
     if ((arrowDirections & WYPopoverArrowDirectionDown) == WYPopoverArrowDirectionDown)
     {

demos/DemoSegue/WYPopoverDemoSegue/WYGesturesViewController.m

@@ -11,7 +11,7 @@
 
 @interface WYGesturesViewController () <WYPopoverControllerDelegate>
 {
-    WYPopoverController* popoverController;
+    WYPopoverController *popoverController;
 }
 
 @end
@@ -20,14 +20,16 @@ @implementation WYGesturesViewController
 
 - (IBAction)buttonTap:(id)sender
 {
-    UIView* view = (UIView *)sender;
+    UIView *button = (UIView *)sender;
 
     UINavigationController* contentViewController = [[UINavigationController alloc] initWithRootViewController:[self.storyboard instantiateViewControllerWithIdentifier:@"StadiumList"]];
 
     popoverController = [[WYPopoverController alloc] initWithContentViewController:contentViewController];
     popoverController.delegate = self;
 
-    [popoverController presentPopoverFromRect:view.bounds inView:view permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+    //[popoverController presentPopoverFromRect:button.bounds inView:button permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+    
+    [popoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:WYPopoverArrowDirectionNone animated:YES];
 }
 
 - (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)aPopoverController