Skip to content

修复一些小问题 #106

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

修复一些小问题 #106

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
2b3f488
fix leak in CFNumberRef
iOSleep Jan 6, 2018
a2aeb15
correct unichar's CFNumberType
iOSleep Jan 6, 2018
d82abf0
comment unused calculate
iOSleep Jan 6, 2018
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
6 changes: 3 additions & 3 deletions TYAttributedLabelDemo/TYAttributedLabel/NSMutableAttributedString+TY.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ - (void)addAttributeCharacterSpacing:(unichar)characterSpacing range:(NSRange)ra
{
[self removeAttribute:(id)kCTKernAttributeName range:range];

CFNumberRef num = CFNumberCreate(kCFAllocatorDefault,kCFNumberSInt8Type,&characterSpacing);
CFNumberRef num = CFNumberCreate(kCFAllocatorDefault,kCFNumberSInt16Type,&characterSpacing);
[self addAttribute:(id)kCTKernAttributeName value:(__bridge id)num range:range];
CFRelease(num);
}
Expand Down Expand Up @@ -102,9 +102,9 @@ - (void)addAttributeStrokeWidth:(unichar)strokeWidth
{
[self removeAttribute:(id)kCTStrokeWidthAttributeName range:range];
if (strokeWidth > 0) {
CFNumberRef num = CFNumberCreate(kCFAllocatorDefault,kCFNumberSInt8Type,&strokeWidth);

CFNumberRef num = CFNumberCreate(kCFAllocatorDefault,kCFNumberSInt16Type,&strokeWidth);
[self addAttribute:(id)kCTStrokeWidthAttributeName value:(__bridge id)num range:range];
CFRelease(num);
}

[self removeAttribute:(id)kCTStrokeColorAttributeName range:range];
Expand Down
4 changes: 2 additions & 2 deletions TYAttributedLabelDemo/TYAttributedLabel/TYAttributedLabel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ - (void)drawSelectionAreaFrame:(CTFrameRef)frameRef InRange:(NSRange)selectRange
else if (selectionStartPosition < range.location && [self isPosition:selectionEndPosition inRange:range]) {
CGFloat ascent, descent, leading, width, offset;
offset = CTLineGetOffsetForStringIndex(line, selectionEndPosition, NULL);
width = CTLineGetTypographicBounds(line, &ascent, &descent, &leading);
// width = CTLineGetTypographicBounds(line, &ascent, &descent, &leading);
CGRect lineRect = CGRectMake(linePoint.x, linePoint.y - descent, offset, ascent + descent);
[self fillSelectionAreaInRect:lineRect radius:radius bgColor:bgColor];
}
Expand Down Expand Up @@ -952,4 +952,4 @@ - (void)appendView:(UIView *)view
}


@end
@end