Skip to content

Fixed NSInteger casts and -intrinsicContentSize. #29

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
bejo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed NSInteger casts and -intrinsicContentSize. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e8582
Fixed NSInteger casts in NSLog statements (removes compiler warnings).
bejo Oct 6, 2014
1e16c22
Added real width to -intrinsicContentSize return value.
bejo Oct 6, 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
4 changes: 2 additions & 2 deletions Example/SMPageControl/SMViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ - (void)viewDidLoad

- (void)pageControl:(id)sender
{
NSLog(@"Current Page (UIPageControl) : %i", self.pageControl.currentPage);
NSLog(@"Current Page (UIPageControl) : %li", (long)self.pageControl.currentPage);
}

- (void)spacePageControl:(SMPageControl *)sender
{
NSLog(@"Current Page (SMPageControl): %i", sender.currentPage);
NSLog(@"Current Page (SMPageControl): %li", (long)sender.currentPage);
}

@end
5 changes: 3 additions & 2 deletions SMPageControl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,10 @@ - (CGSize)sizeThatFits:(CGSize)size
- (CGSize)intrinsicContentSize
{
if (_numberOfPages < 1 || (_numberOfPages < 2 && _hidesForSinglePage)) {
return CGSizeMake(UIViewNoIntrinsicMetric, 0.0f);
return CGSizeZero;
}
CGSize intrinsicContentSize = CGSizeMake(UIViewNoIntrinsicMetric, MAX(_measuredIndicatorHeight, _minHeight));
CGFloat intrinsicContentWidth = [self sizeForNumberOfPages:self.numberOfPages].width;
CGSize intrinsicContentSize = CGSizeMake(intrinsicContentWidth, MAX(_measuredIndicatorHeight, _minHeight));
return intrinsicContentSize;
}

Expand Down