完善毛玻璃逻辑：iOS10 下只有无圆角时才使用系统控件

yulingtianxia · Oct 8, 2016 · e678c7a · e678c7a
1 parent 33d0a31
commit e678c7a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Source/TBActionSheet/TBActionContainer.m b/Source/TBActionSheet/TBActionContainer.m
@@ -48,7 +48,7 @@ - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 
 - (BOOL)useSystemBlurEffect
 {
-    if (kiOS10Later) {
+    if (kiOS10Later && self.actionSheet.rectCornerRadius > 0) {
         return NO;
     }
     if (kiOS8Later) {
@@ -66,7 +66,7 @@ - (BOOL)useSystemBlurEffect
 
 - (BOOL)useSystemBlurEffectUnderView:(UIView *)view
 {
-    if (!view || kiOS10Later) {
+    if (!view || (kiOS10Later && self.actionSheet.rectCornerRadius > 0)) {
         return NO;
     }
     if (kiOS8Later) {

diff --git a/Source/TBActionSheet/TBActionSheet.m b/Source/TBActionSheet/TBActionSheet.m
@@ -511,6 +511,9 @@ - (void)setupStyle
                     UIImage *backgroundImage = [cutOriginalBackgroundImageInRect(self.actionContainer.header.frame) drn_boxblurImageWithBlur:blurRadius withTintColor:self.ambientColor];
                     self.actionContainer.header.image = backgroundImage;
                 }
+                else {
+                    self.actionContainer.header.image = nil;
+                }
             }
             else {
                 self.actionContainer.header.image = nil;
@@ -528,6 +531,9 @@ - (void)setupStyle
                     UIImage *backgroundImage = [cutOriginalBackgroundImageInRect(self.actionContainer.custom.frame) drn_boxblurImageWithBlur:blurRadius withTintColor:self.ambientColor];
                     self.actionContainer.custom.image = backgroundImage;
                 }
+                else {
+                    self.actionContainer.custom.image = nil;
+                }
             }
             else {
                 self.actionContainer.custom.image = nil;
@@ -550,6 +556,10 @@ - (void)setupStyle
                     [obj setBackgroundImage:backgroundImageHighlighted forState:UIControlStateHighlighted];
                     obj.backgroundColor = [UIColor clearColor];
                 }
+                else {
+                    [obj setBackgroundImage:nil forState:UIControlStateNormal];
+                    [obj setBackgroundImage:nil forState:UIControlStateHighlighted];
+                }
             }
             else {
                 [obj setBackgroundImage:nil forState:UIControlStateNormal];

diff --git a/Source/TBActionSheet/UIView+TBAdditions.m b/Source/TBActionSheet/UIView+TBAdditions.m
@@ -93,6 +93,10 @@ - (void)setNoneCorner
 
 - (void)setCornerRadius:(CGFloat) radius
 {
+    if (radius == 0) {
+        [self setNoneCorner];
+        return;
+    }
     switch (self.tbRectCorner) {
         case TBRectCornerTop: {
             [self setTopCornerRadius:radius];
@@ -116,4 +120,4 @@ - (void)setCornerRadius:(CGFloat) radius
     }
 }
 
-@end
+@end