Merge pull request cruffenach#134 from dmiedema/activityIndicatorCenter

Fix Activity Indicator center alignment being shifted left
shicuf · Feb 15, 2015 · 74dd964 · 74dd964
2 parents 583da45 + 5c3ea65
commit 74dd964
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CRToast/CRToastView.m b/CRToast/CRToastView.m
@@ -77,7 +77,7 @@ static CGFloat CRCenterXForActivityIndicatorWithAlignment(CRToastAccessoryViewAl
         case CRToastAccessoryViewAlignmentLeft:
             center = offset; break;
         case CRToastAccessoryViewAlignmentCenter:
-            center = (contentWidth / 2) - offset; break;
+            center = (contentWidth / 2); break;
         case CRToastAccessoryViewAlignmentRight:
             center = contentWidth - offset; break;
     }
@@ -140,7 +140,7 @@ - (void)layoutSubviews {
                                       0 :
                                       CGRectGetHeight(contentFrame));
 
-    CGFloat imageWidth = imageSize.width == 0 ? kCRStatusBarViewNoImageLeftContentInset : CGRectGetMaxX(_imageView.frame);
+    CGFloat imageWidth = imageSize.width == 0 ? 0 : CGRectGetMaxX(_imageView.frame);
     CGFloat x = CRContentXOffsetForViewAlignmentAndWidth(self.toast.imageAlignment, imageWidth);
 
     if (self.toast.showActivityIndicator) {

diff --git a/Tests/Unit Tests/CRToastViewTests.m b/Tests/Unit Tests/CRToastViewTests.m
@@ -110,7 +110,7 @@ - (void)testActivityFrameCenterAlignment {
     toast.options = options;
     self.view.toast = toast;
 
-    CGPoint assumedCenter = CGPointMake(100, 50);
+    CGPoint assumedCenter = self.view.center;
 
     [self.view layoutSubviews];