From d902d111f83129728f4ba5ca19ecda19f1daf3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E4=BB=95=E5=B4=87?= Date: Thu, 20 Aug 2015 23:38:51 +0800 Subject: [PATCH] Set the label text alignment with Center / Fix iOS6 crash bug --- Demo/WSProgressHUD/WSProgressHUD.m | 11 +++-------- WSProgressHUD/WSProgressHUD.m | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Demo/WSProgressHUD/WSProgressHUD.m b/Demo/WSProgressHUD/WSProgressHUD.m index 1b12678..43915d9 100644 --- a/Demo/WSProgressHUD/WSProgressHUD.m +++ b/Demo/WSProgressHUD/WSProgressHUD.m @@ -1043,13 +1043,8 @@ - (instancetype)initWithFrame:(CGRect)frame UIImage *successImage = [UIImage imageWithContentsOfFile:[imageBundle pathForResource:@"success@2x" ofType:@"png"]]; UIImage *failurImage = [UIImage imageWithContentsOfFile:[imageBundle pathForResource:@"error@2x" ofType:@"png"]]; - if ([[UIImage class] instancesRespondToSelector:@selector(imageWithRenderingMode:)]) { - WSProgressHUDSuccessImage = [successImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - WSProgressHUDErrorImage = [failurImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - } else { - WSProgressHUDErrorImage = failurImage; - WSProgressHUDSuccessImage = successImage; - } + WSProgressHUDSuccessImage = [self image:successImage withTintColor:WSProgressHUDForeGroundColor]; + WSProgressHUDErrorImage = [self image:failurImage withTintColor:WSProgressHUDForeGroundColor]; [self addSubview:self.hudView]; @@ -1104,7 +1099,7 @@ - (UILabel *)labelView } _labelView.adjustsFontSizeToFitWidth = YES; _labelView.autoresizingMask = UIViewAutoresizingFlexibleWidth; - _labelView.textAlignment = NSTextAlignmentLeft; + _labelView.textAlignment = NSTextAlignmentCenter; _labelView.numberOfLines = 0; } return _labelView; diff --git a/WSProgressHUD/WSProgressHUD.m b/WSProgressHUD/WSProgressHUD.m index 1b12678..43915d9 100644 --- a/WSProgressHUD/WSProgressHUD.m +++ b/WSProgressHUD/WSProgressHUD.m @@ -1043,13 +1043,8 @@ - (instancetype)initWithFrame:(CGRect)frame UIImage *successImage = [UIImage imageWithContentsOfFile:[imageBundle pathForResource:@"success@2x" ofType:@"png"]]; UIImage *failurImage = [UIImage imageWithContentsOfFile:[imageBundle pathForResource:@"error@2x" ofType:@"png"]]; - if ([[UIImage class] instancesRespondToSelector:@selector(imageWithRenderingMode:)]) { - WSProgressHUDSuccessImage = [successImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - WSProgressHUDErrorImage = [failurImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - } else { - WSProgressHUDErrorImage = failurImage; - WSProgressHUDSuccessImage = successImage; - } + WSProgressHUDSuccessImage = [self image:successImage withTintColor:WSProgressHUDForeGroundColor]; + WSProgressHUDErrorImage = [self image:failurImage withTintColor:WSProgressHUDForeGroundColor]; [self addSubview:self.hudView]; @@ -1104,7 +1099,7 @@ - (UILabel *)labelView } _labelView.adjustsFontSizeToFitWidth = YES; _labelView.autoresizingMask = UIViewAutoresizingFlexibleWidth; - _labelView.textAlignment = NSTextAlignmentLeft; + _labelView.textAlignment = NSTextAlignmentCenter; _labelView.numberOfLines = 0; } return _labelView;