mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the bug that reset indicator view does not remove from super view

This commit is contained in:
DreamPiggy 2018-04-13 01:03:11 +08:00
parent a710bc5472
commit 7701215ae0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SDWebImage/UIView+WebCache.m
View File

@ -296,15 +296,16 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
} }
- (void)setSd_imageIndicator:(id<SDWebImageIndicator>)sd_imageIndicator { - (void)setSd_imageIndicator:(id<SDWebImageIndicator>)sd_imageIndicator {
// Remove the old indicator view
id<SDWebImageIndicator> previousIndicator = self.sd_imageIndicator; id<SDWebImageIndicator> previousIndicator = self.sd_imageIndicator;
if (previousIndicator == sd_imageIndicator) { [previousIndicator.indicatorView removeFromSuperview];
[previousIndicator.indicatorView removeFromSuperview];
} objc_setAssociatedObject(self, @selector(sd_imageIndicator), sd_imageIndicator, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
// Add the new indicator view // Add the new indicator view
UIView *view = sd_imageIndicator.indicatorView; UIView *view = sd_imageIndicator.indicatorView;
if (CGRectEqualToRect(view.frame, CGRectZero)) { if (CGRectEqualToRect(view.frame, CGRectZero)) {
view.frame = self.frame; view.frame = self.bounds;
} }
// Center the indicator view // Center the indicator view
#if SD_MAC #if SD_MAC
@ -316,8 +317,6 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
#endif #endif
view.hidden = NO; view.hidden = NO;
[self addSubview:view]; [self addSubview:view];
objc_setAssociatedObject(self, @selector(sd_imageIndicator), sd_imageIndicator, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} }
- (void)sd_startImageIndicator { - (void)sd_startImageIndicator {