fix issue #69

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -146,6 +146,7 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
 //
 
 - (void)dismissPopoverAnimated:(BOOL)animated;
+- (void)dismissPopoverAnimated:(BOOL)animated options:(WYPopoverAnimationOptions)aOptions;
 
 @end
 

WYPopoverController/WYPopoverController.m

@@ -32,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 #endif
 
 #ifdef DEBUG
-    #define WY_LOG(fmt, ...)        NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+    #define WY_LOG(fmt, ...)		NSLog((@"%s (%d) : " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #else
     #define WY_LOG(...)
 #endif
@@ -511,17 +511,17 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 
 - (BOOL)isPassthroughView:(UIView *)view
 {
-    if (view == nil)
+	if (view == nil)
     {
-        return NO;
-    }
-    
-    if ([self.passthroughViews containsObject:view])
+		return NO;
+	}
+	
+	if ([self.passthroughViews containsObject:view])
     {
-        return YES;
-    }
-    
-    return [self isPassthroughView:view.superview];
+		return YES;
+	}
+	
+	return [self isPassthroughView:view.superview];
 }
 
 @end
@@ -1345,7 +1345,7 @@ @interface WYPopoverController () <WYPopoverOverlayViewDelegate>
 
 @property (nonatomic, assign, readonly) CGSize contentSizeForViewInPopover;
 
-- (void)dismissPopoverAnimated:(BOOL)animated callDelegate:(BOOL)callDelegate;
+- (void)dismissPopoverAnimated:(BOOL)animated callDelegate:(BOOL)callDelegate options:(WYPopoverAnimationOptions)options;
 
 - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
                                           inView:(UIView*)aView
@@ -2047,16 +2047,23 @@ - (void)positionPopover
 
 - (void)dismissPopoverAnimated:(BOOL)aAnimated
 {
-    [self dismissPopoverAnimated:aAnimated callDelegate:NO];
+    [self dismissPopoverAnimated:aAnimated callDelegate:NO options:options];
 }
 
-- (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate
+- (void)dismissPopoverAnimated:(BOOL)aAnimated options:(WYPopoverAnimationOptions)aOptions
+{
+    [self dismissPopoverAnimated:aAnimated callDelegate:NO options:aOptions];
+}
+
+- (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate options:(WYPopoverAnimationOptions)aOptions
 {
     if (overlayView == nil) return;
 
     void (^completionBlock)(BOOL);
 
     CGFloat duration = self.animationDuration;
+    WYPopoverAnimationOptions style = aOptions;
+    
     __weak __typeof__(self) weakSelf = self;
 
     completionBlock = ^(BOOL finished) {
@@ -2070,12 +2077,19 @@ - (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate
                 strongSelf->overlayView.alpha = 0;
             } completion:^(BOOL finished) {
                 __typeof__(self) strongSelf = weakSelf;
+                
+                [strongSelf->containerView removeFromSuperview];
+                strongSelf->containerView = nil;
+                
                 [strongSelf->overlayView removeFromSuperview];
                 strongSelf->overlayView = nil;
             }];
         }
         else
         {
+            [strongSelf->containerView removeFromSuperview];
+            strongSelf->containerView = nil;
+            
             [strongSelf->overlayView removeFromSuperview];
             strongSelf->overlayView = nil;
         }
@@ -2123,11 +2137,21 @@ - (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate
 
     if (aAnimated)
     {
-        CGFloat duration = self.animationDuration;
-        
         [UIView animateWithDuration:duration animations:^{
             __typeof__(self) strongSelf = weakSelf;
-            strongSelf->containerView.alpha = 0;
+            
+            if ((style & WYPopoverAnimationOptionFade) == WYPopoverAnimationOptionFade)
+            {
+                strongSelf->containerView.alpha = 0;
+            }
+            
+            if ((style & WYPopoverAnimationOptionScale) == WYPopoverAnimationOptionScale)
+            {
+                CGAffineTransform endTransform = [self transformTranslateForArrowDirection:strongSelf->containerView.arrowDirection];
+                endTransform = CGAffineTransformScale(endTransform, 0.1, 0.1);
+                strongSelf->containerView.transform = endTransform;
+            }
+            
         } completion:^(BOOL finished) {
             completionBlock(finished);
         }];
@@ -2155,7 +2179,7 @@ - (void)popoverOverlayView:(WYPopoverOverlayView *)aOverlayView didTouchAtPoint:
 
         if (shouldDismiss)
         {
-            [self dismissPopoverAnimated:animated callDelegate:YES];
+            [self dismissPopoverAnimated:animated callDelegate:YES options:options];
         }
     }
 }
@@ -2227,8 +2251,8 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
     }
 
     [areas sortUsingComparator:^NSComparisonResult(id obj1, id obj2) {
-        WYPopoverArea* area1 = (WYPopoverArea*)obj1;
-        WYPopoverArea* area2 = (WYPopoverArea*)obj2;
+        WYPopoverArea *area1 = (WYPopoverArea *)obj1;
+        WYPopoverArea *area2 = (WYPopoverArea *)obj2;
 
         CGFloat val1 = area1.value;
         CGFloat val2 = area2.value;
@@ -2249,7 +2273,7 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
 
     for (NSUInteger i = 0; i < [areas count]; i++)
     {
-        WYPopoverArea* popoverArea = (WYPopoverArea*)[areas objectAtIndex:i];
+        WYPopoverArea *popoverArea = (WYPopoverArea *)[areas objectAtIndex:i];
 
         if (popoverArea.areaSize.width >= contentSize.width)
         {
@@ -2262,7 +2286,7 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
     {
         if ([areas count] > 0)
         {
-            arrowDirection = ((WYPopoverArea*)[areas objectAtIndex:0]).arrowDirection;
+            arrowDirection = ((WYPopoverArea *)[areas objectAtIndex:0]).arrowDirection;
         }
         else
         {