From bc915c6467ef40ce6eb9a204f4c9c968b37261f9 Mon Sep 17 00:00:00 2001 From: Youmiam Date: Tue, 17 Jan 2017 18:15:16 +0100 Subject: [PATCH 1/3] Fixes bug on hideEmptyLayers and on snapshotOfUnderlyingView methods --- FXBlurView/FXBlurView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FXBlurView/FXBlurView.m b/FXBlurView/FXBlurView.m index b18883a..e7e6208 100755 --- a/FXBlurView/FXBlurView.m +++ b/FXBlurView/FXBlurView.m @@ -576,7 +576,7 @@ - (void)displayLayer:(__unused CALayer *)layer - (UIImage *)snapshotOfUnderlyingView { - __strong FXBlurLayer *blurLayer = [self blurPresentationLayer]; + __strong FXBlurLayer *blurLayer = [self blurLayer]; __strong CALayer *underlyingLayer = [self underlyingLayer]; CGRect bounds = [blurLayer convertRect:blurLayer.bounds toLayer:underlyingLayer]; @@ -630,7 +630,7 @@ - (UIImage *)snapshotOfUnderlyingView - (NSArray *)hideEmptyLayers:(CALayer *)layer { NSMutableArray *layers = [NSMutableArray array]; - if (CGRectIsEmpty(layer.bounds)) + if (CGRectIsEmpty(layer.bounds) && !layer.hidden) { layer.hidden = YES; [layers addObject:layer]; From d9155e62ae2784eb243b03f1c62dd2949e30a584 Mon Sep 17 00:00:00 2001 From: CLEMENT Quentin Date: Mon, 6 Feb 2017 14:48:30 +0100 Subject: [PATCH 2/3] FXBlurView master : fix tint color for Youmiam --- FXBlurView/FXBlurView.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FXBlurView/FXBlurView.m b/FXBlurView/FXBlurView.m index e7e6208..5a65d52 100755 --- a/FXBlurView/FXBlurView.m +++ b/FXBlurView/FXBlurView.m @@ -125,8 +125,7 @@ - (UIImage *)blurredImageWithRadius:(CGFloat)radius iterations:(NSUInteger)itera //apply tint if (tintColor && CGColorGetAlpha(tintColor.CGColor) > 0.0f) { - CGContextSetFillColorWithColor(ctx, [tintColor colorWithAlphaComponent:0.25].CGColor); - CGContextSetBlendMode(ctx, kCGBlendModePlusLighter); + CGContextSetFillColorWithColor(ctx, tintColor.CGColor); CGContextFillRect(ctx, CGRectMake(0, 0, buffer1.width, buffer1.height)); } From b65d202b8c8b35240c3e1679a4221e7bc30a9218 Mon Sep 17 00:00:00 2001 From: Quentin CLEMENT Date: Wed, 27 Sep 2017 12:33:49 +0200 Subject: [PATCH 3/3] master call UI on main thread --- FXBlurView/FXBlurView.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FXBlurView/FXBlurView.m b/FXBlurView/FXBlurView.m index 5a65d52..91fda13 100755 --- a/FXBlurView/FXBlurView.m +++ b/FXBlurView/FXBlurView.m @@ -700,9 +700,8 @@ - (void)updateAsynchronously:(BOOL)async completion:(void (^)())completion { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - UIImage *blurredImage = [self blurredSnapshot:snapshot radius:self.blurRadius]; dispatch_sync(dispatch_get_main_queue(), ^{ - + UIImage *blurredImage = [self blurredSnapshot:snapshot radius:self.blurRadius]; [self setLayerContents:blurredImage]; if (completion) completion(); });