fix issue #21

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -1,5 +1,5 @@
 /*
- Version 0.1.3
+ Version 0.1.4-beta
  
  WYPopoverController is available under the MIT license.
  

WYPopoverController/WYPopoverController.m

@@ -1,5 +1,5 @@
 /*
- Version 0.1.3
+ Version 0.1.4-beta
  
  WYPopoverController is available under the MIT license.
  
@@ -1895,9 +1895,14 @@ - (void)popoverOverlayView:(WYPopoverOverlayView*)aOverlayView didTouchAtPoint:(
 {
     BOOL isTouched = [containerView isTouchedAtPoint:[containerView convertPoint:aPoint fromView:aOverlayView]];
 
-    if (!isTouched && delegate && [delegate respondsToSelector:@selector(popoverControllerShouldDismiss:)])
+    if (!isTouched)
     {
-        BOOL shouldDismiss = [delegate popoverControllerShouldDismiss:self];
+        BOOL shouldDismiss = !viewController.modalInPopover;
+        
+        if (shouldDismiss && delegate && [delegate respondsToSelector:@selector(popoverControllerShouldDismiss:)])
+        {
+            shouldDismiss = [delegate popoverControllerShouldDismiss:self];
+        }
 
         if (shouldDismiss)
         {

WYPopoverController/WYStoryboardPopoverSegue.h

@@ -1,5 +1,5 @@
 /*
- Version 0.1.3
+ Version 0.1.4-beta
  
  WYPopoverController is available under the MIT license.
  

WYPopoverController/WYStoryboardPopoverSegue.m

@@ -1,5 +1,5 @@
 /*
- Version 0.1.3
+ Version 0.1.4-beta
  
  WYPopoverController is available under the MIT license.
  

demos/Demo/WYPopoverDemo.xcodeproj/project.pbxproj

@@ -125,6 +125,7 @@
 		976A342417BB9AEB0071BF21 /* WYPopoverDemo */ = {
 			isa = PBXGroup;
 			children = (
+				E0F0630617E7297D004330A2 /* iPad */,
 				97FA5C2B17D1A82E00F611A0 /* WYPopoverController */,
 				976A344717BBAA4C0071BF21 /* WYSettingsViewController.h */,
 				976A344817BBAA4C0071BF21 /* WYSettingsViewController.m */,
@@ -171,6 +172,13 @@
 			path = ../../../WYPopoverController;
 			sourceTree = "<group>";
 		};
+		E0F0630617E7297D004330A2 /* iPad */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = iPad;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -333,9 +341,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WYPopoverDemo/WYPopoverDemo-Prefix.pch";
 				INFOPLIST_FILE = "WYPopoverDemo/WYPopoverDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -346,9 +354,9 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WYPopoverDemo/WYPopoverDemo-Prefix.pch";
 				INFOPLIST_FILE = "WYPopoverDemo/WYPopoverDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.h

@@ -9,7 +9,7 @@
 
 #import "WYPopoverController.h"
 
-@interface WYAllDirectionsViewController : UIViewController <WYPopoverControllerDelegate>
+@interface WYAllDirectionsViewController : UIViewController
 {
 }
 

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -9,9 +9,10 @@
 #import "WYSettingsViewController.h"
 #import "WYAnotherViewController.h"
 
-@interface WYAllDirectionsViewController ()
+@interface WYAllDirectionsViewController () <WYPopoverControllerDelegate, UIPopoverControllerDelegate>
 {
     WYPopoverController* popoverController;
+    UIPopoverController* standardPopoverController;
 }
 
 - (IBAction)showPopover:(id)sender;
@@ -57,10 +58,12 @@ - (IBAction)showPopover:(id)sender
         UIView* btn = (UIView*)sender;
 
         WYSettingsViewController* settingsViewController = [[WYSettingsViewController alloc] init];
-        settingsViewController.contentSizeForViewInPopover = CGSizeMake(280, 200);
+        settingsViewController.preferredContentSize = CGSizeMake(280, 200);
         settingsViewController.title = @"Settings";
         [settingsViewController.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(done:)]];
 
+        settingsViewController.modalInPopover = NO;
+        
         UINavigationController* contentViewController = [[UINavigationController alloc] initWithRootViewController:settingsViewController];
 
         popoverController = [[WYPopoverController alloc] initWithContentViewController:contentViewController];
@@ -69,6 +72,12 @@ - (IBAction)showPopover:(id)sender
         popoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 10, 10, 10);
         popoverController.wantsDefaultContentAppearance = NO;
         [popoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+        
+        /*
+        standardPopoverController = [[UIPopoverController alloc] initWithContentViewController:contentViewController];
+        standardPopoverController.delegate = self;
+        [standardPopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+        */
     }
     else
     {
@@ -98,6 +107,19 @@ - (void)popoverControllerDidDismiss:(WYPopoverController *)controller
     popoverController = nil;
 }
 
+#pragma mark - UIPopoverControllerDelegate
+
+- (BOOL)popoverControllerShouldDismissPopover:(UIPopoverController *)aPopoverController
+{
+    return YES;
+}
+
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)aPopoverController
+{
+    standardPopoverController.delegate = nil;
+    standardPopoverController = nil;
+}
+
 #pragma mark - UIViewControllerRotation
 
 // Applications should use supportedInterfaceOrientations and/or shouldAutorotate..

demos/Demo/WYPopoverDemo/WYPopoverDemo-Info.plist

@@ -24,6 +24,8 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSMainNibFile~ipad</key>
+	<string>WYStoryboard-iPad</string>
 	<key>UIMainStoryboardFile</key>
 	<string>WYStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>