fix issue #44

Author: nicolaschengdev

WYPopoverController/WYPopoverController.m

@@ -93,7 +93,10 @@ - (void)sizzled_pushViewController:(UIViewController *)viewController animated:(
     if (self.isEmbedInPopover)
     {
 #ifdef WY_BASE_SDK_7_ENABLED
-        viewController.edgesForExtendedLayout = UIRectEdgeNone;
+        if ([viewController respondsToSelector:@selector(setEdgesForExtendedLayout:)])
+        {
+            viewController.edgesForExtendedLayout = UIRectEdgeNone;
+        }
 #endif
     }
 
@@ -328,6 +331,7 @@ @interface WYPopoverInnerView : UIView
 
 @property (nonatomic, assign) CGFloat  navigationBarHeight;
 @property (nonatomic, assign) BOOL     wantsDefaultContentAppearance;
+@property (nonatomic, assign) CGFloat  borderWidth;
 
 @end
 
@@ -352,6 +356,7 @@ @implementation WYPopoverInnerView
 
 @synthesize navigationBarHeight;
 @synthesize wantsDefaultContentAppearance;
+@synthesize borderWidth;
 
 - (id)initWithFrame:(CGRect)frame
 {
@@ -386,7 +391,7 @@ - (void)drawRect:(CGRect)rect
 
     UIBezierPath* roundedRectPath = [UIBezierPath bezierPathWithRoundedRect:innerRect cornerRadius:cornerRadius + 1];
 
-    if (wantsDefaultContentAppearance == NO)
+    if (wantsDefaultContentAppearance == NO && borderWidth > 0)
     {
         CGContextSaveGState(context);
         {
@@ -404,14 +409,19 @@ - (void)drawRect:(CGRect)rect
 
     CGContextSaveGState(context);
     {
-        if (wantsDefaultContentAppearance == NO)
+        if (wantsDefaultContentAppearance == NO && borderWidth > 0)
         {
             [roundedRectPath addClip];
             CGContextSetShadowWithColor(context, innerShadowOffset, innerShadowBlurRadius, innerShadowColor.CGColor);
         }
 
         UIBezierPath* inRoundedRectPath = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(innerRect, 0.5, 0.5) cornerRadius:cornerRadius];
 
+        if (borderWidth == 0)
+        {
+            inRoundedRectPath = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(innerRect, 0.5, 0.5) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(cornerRadius, cornerRadius)];
+        }
+        
         [self.innerStrokeColor setStroke];
         inRoundedRectPath.lineWidth = 1;
         [inRoundedRectPath stroke];
@@ -781,6 +791,7 @@ - (void)setViewController:(UIViewController *)viewController
         innerView.innerShadowOffset = innerShadowOffset;
         innerView.innerCornerRadius = self.innerCornerRadius;
         innerView.innerShadowBlurRadius = innerShadowBlurRadius;
+        innerView.borderWidth = self.borderWidth;
     }
 
     innerView.navigationBarHeight = navigationBarHeight;
@@ -835,6 +846,11 @@ - (CGFloat)innerCornerRadius
     if (borderWidth == 0)
     {
         result = 0;
+        
+        if (outerCornerRadius > 0)
+        {
+            result = outerCornerRadius;
+        }
     }
 
     return result;
@@ -1015,6 +1031,18 @@ - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context
 
         reducedOuterCornerRadius = MIN(reducedOuterCornerRadius, outerCornerRadius);
 
+        /*
+        if (borderWidth == 0 && outerCornerRadius > 0)
+        {
+            if ()
+            {
+                result = outerCornerRadius;
+            }
+        }
+        */
+        
+        NSLog(@"outerCornerRadius = %f", outerCornerRadius);
+        
         if (arrowDirection == WYPopoverArrowDirectionUp)
         {
             origin = CGPointMake(CGRectGetMidX(outerRect) + arrowOffset - arrowBase / 2, CGRectGetMinY(outerRect));
@@ -1603,7 +1631,12 @@ - (void)setPopoverNavigationBarBackgroundImage
         if ([navigationController viewControllers] && [[navigationController viewControllers] count] > 0)
         {
 #ifdef WY_BASE_SDK_7_ENABLED
-            [(UIViewController *)[[navigationController viewControllers] objectAtIndex:0] setEdgesForExtendedLayout:UIRectEdgeNone];
+            UIViewController *firstViewController = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];
+            
+            if ([firstViewController respondsToSelector:@selector(setEdgesForExtendedLayout:)])
+            {
+                [firstViewController setEdgesForExtendedLayout:UIRectEdgeNone];
+            }
 #endif
         }
 

demos/DemoSegue/WYPopoverDemoSegue/WYAppDelegate.m

@@ -58,12 +58,39 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [popoverAppearance setFillBottomColor:whyerColor];
     */
 
-    UINavigationBar* navBarAppearance = [UINavigationBar appearanceWhenContainedIn:[UINavigationController class], [WYPopoverBackgroundView class], nil];
+    WYPopoverBackgroundView* popoverAppearance = [WYPopoverBackgroundView appearance];
+    
+    [popoverAppearance setOuterCornerRadius:16];
+    [popoverAppearance setOuterShadowBlurRadius:4];
+    [popoverAppearance setOuterShadowOffset:CGSizeMake(0, 1)];
+    
+    [popoverAppearance setGlossShadowColor:[UIColor clearColor]];
+    [popoverAppearance setGlossShadowOffset:CGSizeMake(0, 0)];
+    
+    [popoverAppearance setBorderWidth:0]; // Breaks
+    [popoverAppearance setArrowHeight:12];
+    [popoverAppearance setArrowBase:20];
+    
+    [popoverAppearance setInnerCornerRadius:8];
+    [popoverAppearance setInnerShadowBlurRadius:0];
+    [popoverAppearance setInnerShadowColor:[UIColor clearColor]];
+    [popoverAppearance setInnerShadowOffset:CGSizeMake(0, 0)];
+    
+    UIColor *uniformColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1];
+    
+    [popoverAppearance setFillTopColor:uniformColor];
+    [popoverAppearance setFillBottomColor:uniformColor];
+    [popoverAppearance setOuterStrokeColor:uniformColor];
+    [popoverAppearance setInnerStrokeColor:uniformColor];
+    
+    /*
+    UINavigationBar *navBarAppearance = [UINavigationBar appearanceWhenContainedIn:[UINavigationController class], [WYPopoverBackgroundView class], nil];
     [navBarAppearance setTitleTextAttributes:@{
                    UITextAttributeTextColor : [UIColor blackColor],
               UITextAttributeTextShadowColor: [UIColor clearColor],
              UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetZero]
     }];
+    */
 
     NSArray *temp = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"players" ofType:@"plist"]];