From 408fb5a0a42ea02d2822cd3ef31f60197f19506f Mon Sep 17 00:00:00 2001 From: Dan Ziemba Date: Fri, 4 May 2012 08:26:09 -0400 Subject: [PATCH] Fix breakages mentioned in Issue 12 and ensure pullToRefreshViewShouldRefresh is called when beginLoading is called --- PullToRefreshView.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PullToRefreshView.m b/PullToRefreshView.m index 607cc9a..45c2400 100644 --- a/PullToRefreshView.m +++ b/PullToRefreshView.m @@ -82,7 +82,7 @@ - (id)initWithScrollView:(UIScrollView *)scroll { subtitleLabel.textAlignment = UITextAlignmentCenter; [self addSubview:subtitleLabel]; - statusLabel = [[UILabel alloc] init]; + statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, frame.size.height - 48.0f, self.frame.size.width, 20.0f)]; statusLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth; statusLabel.font = [UIFont systemFontOfSize:12.f]; statusLabel.textColor = kPullToRefreshViewTitleColor; @@ -108,6 +108,8 @@ - (id)initWithScrollView:(UIScrollView *)scroll { #endif [self.layer addSublayer:arrowImage]; + + [self setState:kPullToRefreshViewStateNormal]; } return self; @@ -167,6 +169,8 @@ - (void)setState:(PullToRefreshViewState)state_ { [self showActivity:YES animated:YES]; [self setImageFlipped:NO]; scrollView.contentInset = UIEdgeInsetsMake(fminf(-scrollView.contentOffset.y, -kPullToRefreshViewTriggerOffset), 0, 0, 0); + if ([delegate respondsToSelector:@selector(pullToRefreshViewShouldRefresh:)]) + [delegate pullToRefreshViewShouldRefresh:self]; break; default: break; @@ -213,9 +217,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N [UIView setAnimationDuration:kPullToRefreshViewAnimationDuration]; [self setState:kPullToRefreshViewStateLoading]; [UIView commitAnimations]; - - if ([delegate respondsToSelector:@selector(pullToRefreshViewShouldRefresh:)]) - [delegate pullToRefreshViewShouldRefresh:self]; } }