fix issue #20

Author: nicolaschengdev

README.md

@@ -100,10 +100,41 @@ Add this line `pod 'WYPopoverController', '~> 0.1.2'` to your PodFile or add man
 
 ##### Simple
 
+In the implementation of your view controller
+
 ```objective-c
-WYPopoverController* popoverController = [[WYPopoverController alloc] initWithContentViewController:controller];
-popoverController.delegate = self;
-[popoverController presentPopoverFromRect:button.bounds inView:button permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+// YourViewController.m
+
+@interface YourViewController () <WYPopoverControllerDelegate>
+{
+    WYPopoverController* popoverController;
+}
+
+- (IBAction)showPopover:(id)sender;
+
+@end
+
+@implementation YourViewController
+
+- (IBAction)showPopover:(id)sender
+{
+	popoverController = [[WYPopoverController alloc] initWithContentViewController:controller];
+    popoverController.delegate = self;
+    [popoverController presentPopoverFromRect:button.bounds inView:button permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+}
+
+- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)controller
+{
+    return YES;
+}
+
+- (void)popoverControllerDidDismiss:(WYPopoverController *)controller
+{
+    popoverController.delegate = nil;
+    popoverController = nil;
+}
+
+@end
 ```
 
 ##### Appearance (Tint Color)
@@ -116,36 +147,37 @@ WYPopoverBackgroundView* appearance = [WYPopoverBackgroundView appearance];
 ##### Appearance (Flat Popover)
 
 ```objective-c
-WYPopoverBackgroundView* appearance = [WYPopoverBackgroundView appearance];
-        
-[appearance setOuterCornerRadius:4];
-[appearance setOuterShadowBlurRadius:0];
-[appearance setOuterShadowColor:[UIColor clearColor]];
-[appearance setOuterShadowOffset:CGSizeMake(0, 0)];
+UIColor* greenColor = [UIColor colorWithRed:26.f/255.f green:188.f/255.f blue:156.f/255.f alpha:1];
+
+WYPopoverBackgroundView* popoverAppearance = [WYPopoverBackgroundView appearance];
 
-[appearance setGlossShadowColor:[UIColor clearColor]];
-[appearance setGlossShadowOffset:CGSizeMake(0, 0)];
+[popoverAppearance setOuterCornerRadius:4];
+[popoverAppearance setOuterShadowBlurRadius:0];
+[popoverAppearance setOuterShadowColor:[UIColor clearColor]];
+[popoverAppearance setOuterShadowOffset:CGSizeMake(0, 0)];
 
-[appearance setBorderWidth:8];
-[appearance setArrowHeight:10];
-[appearance setArrowBase:20];
+[popoverAppearance setGlossShadowColor:[UIColor clearColor]];
+[popoverAppearance setGlossShadowOffset:CGSizeMake(0, 0)];
 
-[appearance setInnerCornerRadius:4];
-[appearance setInnerShadowBlurRadius:0];
-[appearance setInnerShadowColor:[UIColor clearColor]];
-[appearance setInnerShadowOffset:CGSizeMake(0, 0)];
+[popoverAppearance setBorderWidth:8];
+[popoverAppearance setArrowHeight:10];
+[popoverAppearance setArrowBase:20];
 
-UIColor* greenColor = [UIColor colorWithRed:26.f/255.f green:188.f/255.f blue:156.f/255.f alpha:1];
+[popoverAppearance setInnerCornerRadius:4];
+[popoverAppearance setInnerShadowBlurRadius:0];
+[popoverAppearance setInnerShadowColor:[UIColor clearColor]];
+[popoverAppearance setInnerShadowOffset:CGSizeMake(0, 0)];
 
-[appearance setFillTopColor:greenColor];
-[appearance setFillBottomColor:greenColor];
-[appearance setStrokeColor:greenColor];
+[popoverAppearance setFillTopColor:greenColor];
+[popoverAppearance setFillBottomColor:greenColor];
+[popoverAppearance setOuterStrokeColor:greenColor];
+[popoverAppearance setInnerStrokeColor:greenColor];
 
-UINavigationBar* appearance2 = [UINavigationBar appearanceWhenContainedIn:[UINavigationController class], nil];
-[appearance2 setTitleTextAttributes:@{
+UINavigationBar* navBarInPopoverAppearance = [UINavigationBar appearanceWhenContainedIn:[UINavigationController class], [WYPopoverController class], nil];
+[navBarInPopoverAppearance setTitleTextAttributes: @{
                   UITextAttributeTextColor : [UIColor whiteColor],
-             UITextAttributeTextShadowColor: [UIColor clearColor],
-            UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]}];
+            UITextAttributeTextShadowColor : [UIColor clearColor],
+           UITextAttributeTextShadowOffset : [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]}];
 ```
 
 ##### Storyboard
@@ -156,6 +188,10 @@ UINavigationBar* appearance2 = [UINavigationBar appearanceWhenContainedIn:[UINav
 	if ([segue.identifier isEqualToString:@"[YOUR_SEGUE_IDENTIFIER]"])
 	{
 		WYStoryboardPopoverSegue* popoverSegue = (WYStoryboardPopoverSegue*)segue;
+
+		UIViewController* destinationViewController = (UIViewController *)segue.destinationViewController;
+        destinationViewController.contentSizeForViewInPopover = CGSizeMake(280, 280);		// Deprecated in iOS7. Use 'preferredContentSize' instead.
+
         popoverController = [popoverSegue popoverControllerWithSender:sender permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
         popoverController.delegate = self;
 	}

WYPopoverController/WYPopoverController.m

@@ -1265,6 +1265,7 @@ @interface WYPopoverController () <WYPopoverOverlayViewDelegate>
 
 @property (nonatomic, strong, readonly) UIView  *rootView;
 @property (nonatomic, strong, readonly) UIColor *overlayColor;
+@property (nonatomic, assign, readonly) CGSize   contentSizeForViewInPopover;
 
 - (void)dismissPopoverAnimated:(BOOL)animated callDelegate:(BOOL)callDelegate;
 
@@ -1337,6 +1338,31 @@ - (UIColor *)overlayColor
     return result;
 }
 
+- (CGSize)contentSizeForViewInPopover
+{
+    CGSize result = CGSizeZero;
+    
+    if ([viewController respondsToSelector:@selector(preferredContentSize)])
+    {
+        result = viewController.preferredContentSize;
+    }
+    
+    if (CGSizeEqualToSize(result, CGSizeZero))
+    {
+#pragma clang diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+        result = viewController.contentSizeForViewInPopover;
+#pragma clang diagnostic pop
+    }
+    
+    if (CGSizeEqualToSize(result, CGSizeZero))
+    {
+        result = CGSizeMake(320, 1100);
+    }
+    
+    return result;
+}
+
 - (void)presentPopoverFromRect:(CGRect)aRect inView:(UIView *)aView permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections animated:(BOOL)aAnimated
 {
     NSAssert((arrowDirections != WYPopoverArrowDirectionUnknown), @"WYPopoverArrowDirection must not be UNKNOWN");
@@ -1346,7 +1372,7 @@ - (void)presentPopoverFromRect:(CGRect)aRect inView:(UIView *)aView permittedArr
     permittedArrowDirections = arrowDirections;
     animated = aAnimated;
 
-    CGSize contentViewSize = viewController.contentSizeForViewInPopover;
+    CGSize contentViewSize = self.contentSizeForViewInPopover;
 
     if (overlayView == nil)
     {
@@ -1468,7 +1494,11 @@ - (void)drawPopoverNavigationBar
 
         CGFloat navigationBarHeight = 44;
 
-        UIBezierPath *rectPath = [UIBezierPath bezierPathWithRect:CGRectMake(0, 0, 20, navigationBarHeight)];
+        CGRect rectPathRect = CGRectMake(0, 0, 20, navigationBarHeight);
+        
+        CGFloat cornerRadius = containerView.innerCornerRadius;
+        
+        UIBezierPath *rectPath = [UIBezierPath bezierPathWithRoundedRect:rectPathRect byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(cornerRadius, cornerRadius)];
 
         UIGraphicsBeginImageContextWithOptions(rectPath.bounds.size, NO, 0.0f);
 
@@ -1509,7 +1539,7 @@ - (void)drawPopoverNavigationBar
         CGGradientRelease(fillGradient);
         CGColorSpaceRelease(colorSpace);
 
-        [navigationController.navigationBar setBackgroundImage:image forBarMetrics:UIBarMetricsDefault];
+        [navigationController.navigationBar setBackgroundImage:[image resizableImageWithCapInsets:UIEdgeInsetsMake(0, cornerRadius + 1, 0, cornerRadius + 1)] forBarMetrics:UIBarMetricsDefault];
 
         // UIBarMetricsLandscapePhone
 
@@ -1529,14 +1559,19 @@ - (void)drawPopoverNavigationBar
 
         UIGraphicsEndImageContext();
 
-        [navigationController.navigationBar setBackgroundImage:image forBarMetrics:UIBarMetricsLandscapePhone];
+        [navigationController.navigationBar setBackgroundImage:[image resizableImageWithCapInsets:UIEdgeInsetsMake(0, cornerRadius + 1, 0, cornerRadius + 1)] forBarMetrics:UIBarMetricsLandscapePhone];
     }
 
+    viewController.view.clipsToBounds = YES;
+    
     if (containerView.borderWidth == 0)
     {
-        viewController.view.clipsToBounds = YES;
         viewController.view.layer.cornerRadius = containerView.outerCornerRadius;
     }
+    else
+    {
+        viewController.view.layer.cornerRadius = containerView.innerCornerRadius;
+    }
 }
 
 - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections animated:(BOOL)aAnimated
@@ -1549,7 +1584,7 @@ - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item permittedArrowDi
 
 - (void)positionPopover
 {
-    CGSize contentViewSize = viewController.contentSizeForViewInPopover;
+    CGSize contentViewSize = self.contentSizeForViewInPopover;
 
     CGRect viewFrame;
     CGRect containerFrame = CGRectZero;

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.h

@@ -23,6 +23,5 @@
 @property (nonatomic, weak) IBOutlet UIButton* bottomButton;
 @property (nonatomic, weak) IBOutlet UIButton* bottomRightButton;
 
-- (IBAction)tapOnButton:(id)sender;
 
 @end

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -14,6 +14,8 @@ @interface WYAllDirectionsViewController ()
     WYPopoverController* popoverController;
 }
 
+- (IBAction)showPopover:(id)sender;
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////
@@ -48,7 +50,7 @@ - (void)viewDidLoad
     [bottomRightButton setBackgroundImage:normal forState:UIControlStateNormal]; [bottomRightButton setBackgroundImage:highlighted forState:UIControlStateHighlighted];
 }
 
-- (IBAction)tapOnButton:(id)sender
+- (IBAction)showPopover:(id)sender
 {
     if (popoverController == nil)
     {

demos/Demo/WYPopoverDemo/WYAppDelegate.m

@@ -19,6 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     //Appearance 1 (white popover)
     //
+    /*
     WYPopoverBackgroundView* popoverAppearance = [WYPopoverBackgroundView appearance];
     [popoverAppearance setTintColor:[UIColor whiteColor]];
     
@@ -40,12 +41,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [popoverAppearance setInnerShadowColor:[UIColor colorWithWhite:0 alpha:0.75]];
     [popoverAppearance setInnerShadowOffset:CGSizeMake(0, 1)];
     
+    [popoverAppearance setViewContentInsets:UIEdgeInsetsMake(3, 0, 0, 0)];
+    
     UINavigationBar* navBarAppearance = [UINavigationBar appearanceWhenContainedIn:[WYPopoverBackgroundView class], [UINavigationController class], nil];
     [navBarAppearance setTitleTextAttributes:@{
                    UITextAttributeTextColor : [UIColor darkGrayColor],
               UITextAttributeTextShadowColor: [UIColor whiteColor],
              UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]
     }];
+    */
 
     //Appearance 2 (orange popover)
     //

demos/Demo/WYPopoverDemo/WYModalViewController.m

@@ -37,6 +37,10 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
     {
         WYStoryboardPopoverSegue* popoverSegue = (WYStoryboardPopoverSegue*)segue;
 
+        UIViewController* destinationViewController = (UIViewController *)segue.destinationViewController;
+        
+        destinationViewController.contentSizeForViewInPopover = CGSizeMake(280, 280);
+        
         popoverController = [popoverSegue popoverControllerWithSender:sender permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 
         popoverController.delegate = self;

demos/Demo/WYPopoverDemo/WYSettingsViewController.m

@@ -30,22 +30,22 @@ - (void)viewDidLoad
 
 - (void)viewWillAppear:(BOOL)animated
 {
-    NSLog(@"view WILL appear");
+    //NSLog(@"view WILL appear");
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
-    NSLog(@"view DID appear");
+    //NSLog(@"view DID appear");
 }
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-    NSLog(@"view WILL disappear");
+    //NSLog(@"view WILL disappear");
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
-    NSLog(@"view DID disappear");
+    //NSLog(@"view DID disappear");
 }
 
 - (void)didReceiveMemoryWarning