Skip to content

Fix for: sizeWithFont:minFontSize:actualFontSize:forWidth:lineBreakM… #6

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
knutigro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for: sizeWithFont:minFontSize:actualFontSize:forWidth:lineBreakM… #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 31 additions & 14 deletions PICircularProgressView/PICircularProgressView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,24 +131,41 @@ - (void)drawRect:(CGRect)rect
CGFloat diagonal = 2 * (radius - circleWidth);
CGFloat edge = diagonal / sqrtf(2);

CGFloat actualFontSize;
CGSize maximumSize = CGSizeMake(edge, edge);
CGSize expectedSize = [progressString sizeWithFont:font
minFontSize:5.0
actualFontSize:&actualFontSize
forWidth:maximumSize.width
lineBreakMode:NSLineBreakByWordWrapping];
CGSize expectedSize = CGSizeZero;

if (actualFontSize < fontSize)
{
font = [font fontWithSize:actualFontSize];
if ([progressString respondsToSelector:@selector(sizeWithAttributes:)]) {
expectedSize = [progressString sizeWithAttributes:@{NSFontAttributeName:font}];
if (expectedSize.width > maximumSize.width) {
CGFloat ratio = maximumSize.width / expectedSize.width;
CGFloat fontSize = font.pointSize * ratio;
font = [font fontWithSize:fontSize];
expectedSize = [progressString sizeWithAttributes:@{NSFontAttributeName:font}];
}
} else {
// pre-iOS7.0
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CGFloat actualFontSize;

expectedSize = [progressString sizeWithFont:font
minFontSize:5.0
actualFontSize:&actualFontSize
forWidth:maximumSize.width
lineBreakMode:NSLineBreakByWordWrapping];
minFontSize:5.0
actualFontSize:&actualFontSize
forWidth:maximumSize.width
lineBreakMode:NSLineBreakByWordWrapping];

if (actualFontSize < fontSize)
{
font = [font fontWithSize:actualFontSize];
expectedSize = [progressString sizeWithFont:font
minFontSize:5.0
actualFontSize:&actualFontSize
forWidth:maximumSize.width
lineBreakMode:NSLineBreakByWordWrapping];
}
#pragma clang diagnostic pop
}

CGPoint origin = CGPointMake(center.x - expectedSize.width / 2.0, center.y - expectedSize.height / 2.0);

[_textColor setFill];
Expand Down