Skip to content

Fix a bug when scrollview has content inset top 0 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mplulu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix a bug when scrollview has content inset top 0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42e3b01
fix a bug cause when scrollview with content inset top 0 will cause t…
mplulu Nov 19, 2014
e34f254
respect line width when create bar item by shift the x, y half of lin…
mplulu Nov 19, 2014
8826f43
Merge branch 'respect-line-width'
mplulu Nov 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CBStoreHouseRefreshControl/ContentViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ @implementation ContentViewController

- (void)viewDidLoad {
[super viewDidLoad];

// self.edgesForExtendedLayout = UIRectEdgeNone;
self.title = @"Storehouse";
self.navigationController.navigationBar.barStyle = UIBarStyleBlack;
self.navigationController.navigationBar.barTintColor = [UIColor colorWithWhite:0.1 alpha:1];
Expand Down
14 changes: 9 additions & 5 deletions Class/CBStoreHouseRefreshControl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ + (CBStoreHouseRefreshControl*)attachToScrollView:(UIScrollView *)scrollView
CGPoint startPoint = CGPointFromString(startPoints[i]);
CGPoint endPoint = CGPointFromString(endPoints[i]);

if (startPoint.x > width) width = startPoint.x;
if (endPoint.x > width) width = endPoint.x;
if (startPoint.y > height) height = startPoint.y;
if (endPoint.y > height) height = endPoint.y;
// shift it base on line width
if (startPoint.x + lineWidth > width) width = startPoint.x + lineWidth;
if (endPoint.x + lineWidth > width) width = endPoint.x + lineWidth;
if (startPoint.y + lineWidth > height) height = startPoint.y + lineWidth;
if (endPoint.y + lineWidth > height) height = endPoint.y + lineWidth;
}
refreshControl.frame = CGRectMake(0, 0, width, height);

Expand All @@ -110,6 +111,9 @@ + (CBStoreHouseRefreshControl*)attachToScrollView:(UIScrollView *)scrollView

CGPoint startPoint = CGPointFromString(startPoints[i]);
CGPoint endPoint = CGPointFromString(endPoints[i]);
// shift it base on line width
startPoint = CGPointMake(startPoint.x + lineWidth/2, startPoint.y + lineWidth/2);
endPoint = CGPointMake(endPoint.x + lineWidth/2, endPoint.y + lineWidth/2);

BarItem *barItem = [[BarItem alloc] initWithFrame:refreshControl.frame startPoint:startPoint endPoint:endPoint color:color lineWidth:lineWidth];
barItem.tag = i;
Expand All @@ -136,9 +140,9 @@ + (CBStoreHouseRefreshControl*)attachToScrollView:(UIScrollView *)scrollView

- (void)scrollViewDidScroll
{
if (self.originalTopContentInset == 0) self.originalTopContentInset = self.scrollView.contentInset.top;
self.center = CGPointMake([UIScreen mainScreen].bounds.size.width/2, self.realContentOffsetY*krelativeHeightFactor);
if (self.state == CBStoreHouseRefreshControlStateIdle)
self.originalTopContentInset = self.scrollView.contentInset.top;
[self updateBarItemsWithProgress:self.animationProgress];
}

Expand Down