fix issue #22

Author: nicolaschengdev

README.md

@@ -161,12 +161,12 @@ In the implementation of your view controller
     [popoverController presentPopoverFromRect:button.bounds inView:button permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 }
 
-- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)controller
+- (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)controller
 {
     return YES;
 }
 
-- (void)popoverControllerDidDismiss:(WYPopoverController *)controller
+- (void)popoverControllerDidDismissPopover:(WYPopoverController *)controller
 {
     popoverController.delegate = nil;
     popoverController = nil;
@@ -244,8 +244,8 @@ When showing a popover controller, there are times when you will need to handle
 
 Situations when handling is required:
 
-* If the popover controller is presented from a target rectangle using the `-presentPopoverFromRect:inView:permittedArrowDirections:animated` method of WYPopoverController.
-* If the popover controller is presented from a bar button item that is removed after the rotation has finished.
+* If the popover controller is presented from a target rectangle using the `-presentPopoverFromRect:inView:permittedArrowDirections:animated` method of WYPopoverController. You can use `-popoverController:willRepositionPopoverToRect:inView:` method introduced in the **0.1.6 release** .
+* If the popover controller is presented from a bar button item that is removed after the rotation has finished .
 
 ### Change logs
 

WYPopoverController/WYPopoverController.h

@@ -1,5 +1,5 @@
 /*
- Version 0.1.5
+ Version 0.1.6-beta
  
  WYPopoverController is available under the MIT license.
  
@@ -112,8 +112,9 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
 @protocol WYPopoverControllerDelegate <NSObject>
 @optional
 
-- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)popoverController;
-- (void)popoverControllerDidDismiss:(WYPopoverController *)popoverController;
+- (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)popoverController;
+- (void)popoverControllerDidDismissPopover:(WYPopoverController *)popoverController;
+- (void)popoverController:(WYPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView **)view;
 
 @end
 

WYPopoverController/WYPopoverController.m

@@ -1,5 +1,5 @@
 /*
- Version 0.1.5
+ Version 0.1.6-beta
  
  WYPopoverController is available under the MIT license.
  
@@ -1862,9 +1862,9 @@ - (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate
 
         if (callDelegate)
         {
-            if (delegate && [delegate respondsToSelector:@selector(popoverControllerDidDismiss:)])
+            if (delegate && [delegate respondsToSelector:@selector(popoverControllerDidDismissPopover:)])
             {
-                [delegate popoverControllerDidDismiss:self];
+                [delegate popoverControllerDidDismissPopover:self];
             }
         }
     };
@@ -1918,9 +1918,9 @@ - (void)popoverOverlayView:(WYPopoverOverlayView*)aOverlayView didTouchAtPoint:(
     {
         BOOL shouldDismiss = !viewController.modalInPopover;
 
-        if (shouldDismiss && delegate && [delegate respondsToSelector:@selector(popoverControllerShouldDismiss:)])
+        if (shouldDismiss && delegate && [delegate respondsToSelector:@selector(popoverControllerShouldDismissPopover:)])
         {
-            shouldDismiss = [delegate popoverControllerShouldDismiss:self];
+            shouldDismiss = [delegate popoverControllerShouldDismissPopover:self];
         }
 
         if (shouldDismiss)
@@ -2164,6 +2164,23 @@ - (void)didChangeDeviceOrientation:(NSNotification*)notification
         inView = [barButtonItem valueForKey:@"view"];
         rect = inView.bounds;
     }
+    else if ([delegate respondsToSelector:@selector(popoverController:willRepositionPopoverToRect:inView:)])
+    {
+        CGRect anotherRect;
+        UIView *anotherInView;
+        
+        [delegate popoverController:self willRepositionPopoverToRect:&anotherRect inView:&anotherInView];
+        
+        if (&anotherRect != NULL)
+        {
+            rect = anotherRect;
+        }
+        
+        if (&anotherInView != NULL)
+        {
+            inView = anotherInView;
+        }
+    }
 
     [self positionPopover];
     [containerView setNeedsDisplay];

WYPopoverController/WYStoryboardPopoverSegue.h

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

WYPopoverController/WYStoryboardPopoverSegue.m

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

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -13,6 +13,7 @@ @interface WYAllDirectionsViewController () <WYPopoverControllerDelegate>
 {
     WYPopoverController* settingsPopoverController;
     WYPopoverController* anotherPopoverController;
+    WYPopoverController* datePopoverController;
 }
 
 - (IBAction)showPopover:(id)sender;
@@ -62,6 +63,7 @@ - (IBAction)showPopover:(id)sender
     {
         UIView* btn = (UIView*)sender;
 
+        /*
         WYSettingsViewController *settingsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WYSettingsViewController"];
         
         if ([settingsViewController respondsToSelector:@selector(setPreferredContentSize:)]) {
@@ -84,6 +86,31 @@ - (IBAction)showPopover:(id)sender
         settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 10, 10, 10);
         settingsPopoverController.wantsDefaultContentAppearance = NO;
         [settingsPopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
+        */
+        
+        UIViewController *vc = [[UIViewController alloc] init];
+        
+        vc.view = [[UIDatePicker alloc] init];
+        vc.title = @"Data";
+        
+        datePopoverController = [[WYPopoverController alloc] initWithContentViewController:[[UINavigationController alloc] initWithRootViewController:vc]];
+        
+        CGSize viewSize = vc.view.bounds.size;
+        
+        NSLog(@"viewSize = %@", NSStringFromCGSize(viewSize)); // ---> height is 216 instead of 162
+        
+        if ([vc respondsToSelector:@selector(setPreferredContentSize:)])
+        {
+            viewSize.height = 162;
+            vc.edgesForExtendedLayout = UIRectEdgeNone;
+            vc.preferredContentSize = viewSize;
+        }
+        else
+        {
+            vc.contentSizeForViewInPopover = viewSize;
+        }
+        
+        [datePopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
     }
     else
     {
@@ -112,12 +139,12 @@ - (void)done:(id)sender
 
 #pragma mark - WYPopoverControllerDelegate
 
-- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)controller
+- (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)controller
 {
     return YES;
 }
 
-- (void)popoverControllerDidDismiss:(WYPopoverController *)controller
+- (void)popoverControllerDidDismissPopover:(WYPopoverController *)controller
 {
     if (controller == settingsPopoverController)
     {
@@ -155,6 +182,15 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
     return UIInterfaceOrientationPortrait;
 }
 
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+{
+    [UIView animateWithDuration:duration animations:^{
+        CGRect frame = self.bottomRightButton.frame;
+        frame.origin.y = (UIInterfaceOrientationIsPortrait(toInterfaceOrientation) ? self.bottomLeftButton.frame.origin.y : frame.origin.y - frame.size.height * 1.25f);
+        self.bottomRightButton.frame = frame;
+    }];
+}
+
 #pragma mark - Memory Management
 
 - (void)didReceiveMemoryWarning

demos/Demo/WYPopoverDemo/WYStoryboard.storyboard

@@ -217,6 +217,50 @@
             </objects>
             <point key="canvasLocation" x="5058" y="-75"/>
         </scene>
+        <!--View Controller-->
+        <scene sceneID="Pb1-RX-Bgj">
+            <objects>
+                <viewController id="3gg-Fc-gp2" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="VFT-XI-T8U">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" id="mHh-qb-i3T">
+                                <rect key="frame" x="0.0" y="50" width="320" height="162"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <date key="date" timeIntervalSinceReferenceDate="402404376.16816503">
+                                    <!--2013-10-02 10:59:36 +0000-->
+                                </date>
+                                <timeZone key="timeZone" name="America/Los_Angeles">
+                                    <mutableData key="data">
+VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
+y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
+5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
+8n/BkPNvwKD0X6OQ9U+ioPY/hZD3L4Sg+CiiEPkPZqD6CIQQ+viDIPvoZhD82GUg/chIEP64RyD/qCoQ
+AJgpIAGIDBACeAsgA3EokARhJ6AFUQqQBkEJoAcw7JAHjUOgCRDOkAmtvyAK8LCQC+CvoAzZzRANwJGg
+DrmvEA+priAQmZEQEYmQIBJ5cxATaXIgFFlVEBVJVCAWOTcQFyk2IBgiU5AZCRggGgI1kBryNKAb4heQ
+HNIWoB3B+ZAesfigH6HbkCB2KyAhgb2QIlYNICNq2hAkNe8gJUq8ECYV0SAnKp4QJ/7toCkKgBAp3s+g
+KupiECu+saAs036QLZ6ToC6zYJAvfnWgMJNCkDFnkiAycySQM0d0IDRTBpA1J1YgNjLokDcHOCA4HAUQ
+OOcaIDn75xA6xvwgO9vJEDywGKA9u6sQPo/6oD+bjRBAb9ygQYSpkEJPvqBDZIuQRC+goEVEbZBF89Mg
+Ry2KEEfTtSBJDWwQSbOXIErtThBLnLOgTNZqkE18laBOtkyQT1x3oFCWLpBRPFmgUnYQkFMcO6BUVfKQ
+VPwdoFY11JBW5TogWB7xEFjFHCBZ/tMQWqT+IFvetRBchOAgXb6XEF5kwiBfnnkQYE3eoGGHlZBiLcCg
+Y2d3kGQNoqBlR1mQZe2EoGcnO5BnzWagaQcdkGmtSKBq5v+Qa5ZlIGzQHBBtdkcgbq/+EG9WKSBwj+AQ
+cTYLIHJvwhBzFe0gdE+kEHT/CaB2OMCQdt7roHgYopB4vs2gefiEkHqer6B72GaQfH6RoH24SJB+XnOg
+f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
+AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
+</mutableData>
+                                </timeZone>
+                            </datePicker>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="tPV-ft-NBj" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4771" y="603"/>
+        </scene>
     </scenes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>

demos/DemoSegue/WYPopoverDemoSegue/WYGesturesViewController.m

@@ -30,7 +30,7 @@ - (IBAction)buttonTap:(id)sender
     [popoverController presentPopoverFromRect:view.bounds inView:view permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 }
 
-- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)aPopoverController
+- (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)aPopoverController
 {
     return YES;
 }

demos/DemoSegue/WYPopoverDemoSegue/WYPlayersViewController.m

@@ -66,12 +66,12 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
 
 #pragma mark - WYPopoverControllerDelegate
 
-- (BOOL)popoverControllerShouldDismiss:(WYPopoverController *)aPopoverController
+- (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)aPopoverController
 {
     return YES;
 }
 
-- (void)popoverControllerDidDismiss:(WYPopoverController *)aPopoverController
+- (void)popoverControllerDidDismissPopover:(WYPopoverController *)aPopoverController
 {
     if (aPopoverController == playerDetailsPopoverController)
     {