fix popover content size when used with uinavigationcontroller on ios7

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -34,11 +34,11 @@
 #endif
 
 typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
-    WYPopoverArrowDirectionNone = 0,
     WYPopoverArrowDirectionUp = 1UL << 0,
     WYPopoverArrowDirectionDown = 1UL << 1,
     WYPopoverArrowDirectionLeft = 1UL << 2,
     WYPopoverArrowDirectionRight = 1UL << 3,
+    WYPopoverArrowDirectionNone = 1UL << 4,
     WYPopoverArrowDirectionAny = WYPopoverArrowDirectionUp | WYPopoverArrowDirectionDown | WYPopoverArrowDirectionLeft | WYPopoverArrowDirectionRight,
     WYPopoverArrowDirectionUnknown = NSUIntegerMax
 };
@@ -104,6 +104,8 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
                permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
                                animated:(BOOL)animated;
 
+- (void)presentPopoverAsDialogAnimated:(BOOL)animated;
+
 - (void)dismissPopoverAnimated:(BOOL)animated;
 
 @end

WYPopoverController/WYPopoverController.m

@@ -144,6 +144,10 @@ - (NSString*)description
     {
         direction = @"RIGHT";
     }
+    else if (arrowDirection == WYPopoverArrowDirectionNone)
+    {
+        direction = @"NONE";
+    }
 
     return [NSString stringWithFormat:@"%@ [ %f x %f ]", direction, areaSize.width, areaSize.height];
 }
@@ -995,7 +999,7 @@ - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context
                 reducedOuterCornerRadius = (CGRectGetMidX(outerRect) + arrowOffset - arrowBase / 2) - CGRectGetMinX(outerRect);
             }
         }
-        else
+        else if (arrowDirection == WYPopoverArrowDirectionLeft || arrowDirection == WYPopoverArrowDirectionRight)
         {
             if (arrowOffset >= 0)
             {
@@ -1009,22 +1013,6 @@ - (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));
@@ -1093,6 +1081,23 @@ - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context
             CGPathAddLineToPoint(outerPathRef, NULL, origin.x, origin.y);
         }
 
+        if (arrowDirection == WYPopoverArrowDirectionNone)
+        {
+            origin = CGPointMake(CGRectGetMaxX(outerRect), CGRectGetMidY(outerRect));
+            
+            CGPathMoveToPoint(outerPathRef, NULL, origin.x, origin.y);
+            
+            CGPathAddLineToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect), CGRectGetMidY(outerRect));
+            CGPathAddLineToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect), CGRectGetMidY(outerRect));
+            
+            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);
+            CGPathAddArcToPoint(outerPathRef, NULL, CGRectGetMaxX(outerRect), CGRectGetMinY(outerRect), CGRectGetMaxX(outerRect), CGRectGetMaxY(outerRect), outerCornerRadius);
+            
+            CGPathAddLineToPoint(outerPathRef, NULL, origin.x, origin.y);
+        }
+        
         CGPathCloseSubpath(outerPathRef);
 
         UIBezierPath* outerRectPath = [UIBezierPath bezierPathWithCGPath:outerPathRef];
@@ -1230,7 +1235,7 @@ - (CGRect)arrowRect:(CGRect)rect arrowDirection:(WYPopoverArrowDirection)aArrowD
 {
     CGRect result = CGRectZero;
 
-    if (arrowHeight > 0 && aArrowDirection != WYPopoverArrowDirectionDown)
+    if (arrowHeight > 0)
     {
         result.size = CGSizeMake(arrowBase, arrowHeight);
 
@@ -1432,10 +1437,14 @@ - (CGSize)contentSizeForViewInPopover
 
     UIViewController *controller = viewController;
 
-    UINavigationController *navigationController = (UINavigationController *)controller;
-    if ([[navigationController viewControllers] count] > 0)
+    if ([controller isKindOfClass:[UINavigationController class]])
     {
-        controller = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];
+        UINavigationController *navigationController = (UINavigationController *)controller;
+        
+        if ([[navigationController viewControllers] count] > 0)
+        {
+            controller = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];
+        }
     }
 
 #ifdef WY_BASE_SDK_7_ENABLED
@@ -1444,12 +1453,10 @@ - (CGSize)contentSizeForViewInPopover
         result = controller.preferredContentSize;
     }
 #endif
-    
     if (CGSizeEqualToSize(result, CGSizeZero))
     {
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-        
         result = controller.contentSizeForViewInPopover;
 #pragma clang diagnostic pop
     }
@@ -1615,6 +1622,11 @@ - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item permittedArrowDi
     [self presentPopoverFromRect:itemView.bounds inView:itemView permittedArrowDirections:arrowDirections animated:aAnimated];
 }
 
+- (void)presentPopoverAsDialogAnimated:(BOOL)aAnimated
+{
+    [self presentPopoverFromRect:CGRectZero inView:nil permittedArrowDirections:WYPopoverArrowDirectionNone animated:aAnimated];
+}
+
 - (void)positionPopover
 {
     CGSize contentViewSize = self.contentSizeForViewInPopover;
@@ -1630,7 +1642,7 @@ - (void)positionPopover
 
     overlayView.frame = self.rootView.bounds;
 
-    viewFrame = (permittedArrowDirections != WYPopoverArrowDirectionNone) ? [overlayView convertRect:rect fromView:inView] : overlayView.bounds;
+    viewFrame = [overlayView convertRect:rect fromView:inView];
 
     minX = popoverLayoutMargins.left;
     maxX = self.rootView.bounds.size.width - popoverLayoutMargins.right;
@@ -1858,11 +1870,11 @@ - (void)positionPopover
         containerFrame.size.height = MIN(maxY - minY, containerFrame.size.height);
         containerView.frame = containerFrame;
 
-        containerView.center = CGPointMake(viewFrame.size.width / 2, viewFrame.size.height / 2);
+        containerView.center = CGPointMake(minX + (maxX - minX) / 2, minY + (maxY - minY) / 2);
 
         containerFrame = containerView.frame;
 
-        containerView.arrowOffset = 0;
+        containerView.arrowOffset = offset;
     }
 
     containerView.frame = containerFrame;
@@ -1975,13 +1987,8 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
 {
     WYPopoverArrowDirection arrowDirection = WYPopoverArrowDirectionUnknown;
 
-    if (arrowDirections == WYPopoverArrowDirectionNone)
-    {
-        arrowDirection = WYPopoverArrowDirectionNone;
-    }
-    
-    NSMutableArray *areas = [NSMutableArray arrayWithCapacity:0];
-    WYPopoverArea *area;
+    NSMutableArray* areas = [NSMutableArray arrayWithCapacity:0];
+    WYPopoverArea* area;
 
     if ((arrowDirections & WYPopoverArrowDirectionDown) == WYPopoverArrowDirectionDown)
     {
@@ -2014,6 +2021,14 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
         area.arrowDirection = WYPopoverArrowDirectionRight;
         [areas addObject:area];
     }
+
+    if ((arrowDirections & WYPopoverArrowDirectionNone) == WYPopoverArrowDirectionNone)
+    {
+        area = [[WYPopoverArea alloc] init];
+        area.areaSize = [self sizeForRect:aRect inView:aView arrowHeight:arrowHeight arrowDirection:WYPopoverArrowDirectionNone];
+        area.arrowDirection = WYPopoverArrowDirectionNone;
+        [areas addObject:area];
+    }
 
     if ([areas count] > 1)
     {
@@ -2129,6 +2144,11 @@ - (CGSize)sizeForRect:(CGRect)aRect
         result.height = maxY - (viewFrame.origin.y + viewFrame.size.height);
         result.height -= arrowHeight;
     }
+    else if (arrowDirection == WYPopoverArrowDirectionNone)
+    {
+        result.width = maxX - minX;
+        result.height = maxY - minY;
+    }
 
     return result;
 }

demos/DemoSegue/WYPopoverDemoSegue/WYGesturesViewController.m

@@ -29,7 +29,7 @@ - (IBAction)buttonTap:(id)sender
 
     //[popoverController presentPopoverFromRect:button.bounds inView:button permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 
-    [popoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:WYPopoverArrowDirectionNone animated:YES];
+    [popoverController presentPopoverFromRect:CGRectZero inView:nil permittedArrowDirections:WYPopoverArrowDirectionNone animated:YES];
 }
 
 - (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)aPopoverController