Skip to content

fix deprecations of sizeWithFont for ios 7 #40

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

fix deprecations of sizeWithFont for ios 7 #40

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
7 changes: 4 additions & 3 deletions XYPieChart/XYPieChart.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ - (void)setShowPercentage:(BOOL)showPercentage
label = [NSString stringWithFormat:@"%0.0f", layer.percentage*100];
else
label = (layer.text)?layer.text:[NSString stringWithFormat:@"%0.0f", layer.value];
CGSize size = [label sizeWithFont:self.labelFont];
//CGSize size = [label sizeWithFont:self.labelFont];
CGSize size = [label sizeWithAttributes:@{NSFontAttributeName:self.labelFont}];

if(M_PI*2*_labelRadius*layer.percentage < MAX(size.width,size.height))
{
Expand Down Expand Up @@ -640,7 +641,7 @@ - (SliceLayer *)createSliceLayer
[textLayer setShadowOpacity:1.0f];
[textLayer setShadowRadius:2.0f];
}
CGSize size = [@"0" sizeWithFont:self.labelFont];
CGSize size = [@"" sizeWithAttributes:@{NSFontAttributeName:self.labelFont}];
[CATransaction setDisableActions:YES];
[textLayer setFrame:CGRectMake(0, 0, size.width, size.height)];
[textLayer setPosition:CGPointMake(_pieCenter.x + (_labelRadius * cos(0)), _pieCenter.y + (_labelRadius * sin(0)))];
Expand All @@ -660,7 +661,7 @@ - (void)updateLabelForLayer:(SliceLayer *)pieLayer value:(CGFloat)value
else
label = (pieLayer.text)?pieLayer.text:[NSString stringWithFormat:@"%0.0f", value];

CGSize size = [label sizeWithFont:self.labelFont];
CGSize size = [label sizeWithAttributes:@{NSFontAttributeName:self.labelFont}];

[CATransaction setDisableActions:YES];
if(M_PI*2*_labelRadius*pieLayer.percentage < MAX(size.width,size.height) || value <= 0)
Expand Down