Bugfix CGRect of titleFrame

When updating the subTitle, at the beginning the subTitleLabel.text is empty. It should be filled before setting the frame Rects, if not the labels will overlay.
RonaldAndersonAol · Feb 14, 2013 · b36a9bc · b36a9bc
1 parent 36c3270
commit b36a9bc
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
@@ -173,23 +173,7 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
 }
 
 - (void)layoutSubviews {
- CGFloat remainingWidth = self.superview.bounds.size.width-200;
- float position = 0.50;
-
- CGRect titleFrame = self.titleLabel.frame;
- titleFrame.origin.x = ceilf(remainingWidth*position+44);
- titleFrame.origin.y = self.bounds.size.height-(self.subtitleLabel.text ? 48 : 40);
- self.titleLabel.frame = titleFrame;
-
- CGRect subtitleFrame = self.subtitleLabel.frame;
- subtitleFrame.origin.x = titleFrame.origin.x;
- subtitleFrame.origin.y = self.bounds.size.height-32;
- self.subtitleLabel.frame = subtitleFrame;
 
- CGRect arrowFrame = self.arrow.frame;
- arrowFrame.origin.x = ceilf(remainingWidth*position);
- self.arrow.frame = arrowFrame;
-
  self.activityIndicatorView.center = self.arrow.center;
 
  for(id otherView in self.viewForState) {
@@ -205,10 +189,6 @@ - (void)layoutSubviews {
  self.arrow.hidden = hasCustomView;
 
  if(hasCustomView) {
- for (UIView *subview in self.subviews) {
- [subview removeFromSuperview];
- }
-
  [self addSubview:customView];
  CGRect viewBounds = [customView bounds];
  CGPoint origin = CGPointMake(roundf((self.bounds.size.width-viewBounds.size.width)/2), roundf((self.bounds.size.height-viewBounds.size.height)/2));
@@ -238,6 +218,24 @@ - (void)layoutSubviews {
  break;
  }
  }
+
+ CGFloat remainingWidth = self.superview.bounds.size.width-200;
+ float position = 0.50;
+
+ CGRect titleFrame = self.titleLabel.frame;
+ titleFrame.origin.x = ceilf(remainingWidth*position+44);
+ titleFrame.origin.y = self.bounds.size.height-(self.subtitleLabel.text ? 48 : 40);
+ self.titleLabel.frame = titleFrame;
+
+ CGRect subtitleFrame = self.subtitleLabel.frame;
+ subtitleFrame.origin.x = titleFrame.origin.x;
+ subtitleFrame.origin.y = self.bounds.size.height-32;
+ self.subtitleLabel.frame = subtitleFrame;
+
+ CGRect arrowFrame = self.arrow.frame;
+ arrowFrame.origin.x = ceilf(remainingWidth*position);
+ self.arrow.frame = arrowFrame;
+
 }
 
 #pragma mark - Scroll View