Skip to content

Fix cocos2d-js issue: Font height was not getting calculated properly in iOS. #19926

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

Merged
merged 1 commit into from
Jul 18, 2019
Merged

Fix cocos2d-js issue: Font height was not getting calculated properly in iOS. #19926

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
4 changes: 2 additions & 2 deletions cocos/platform/ios/CCDevice-ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static CGSize _calculateShrinkedSizeForString(NSAttributedString **str,
*str = __attributedStringWithFontSize(mutableString, fontSize);

CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(constrainSize.width, MAX_MEASURE_HEIGHT)
options:(NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading)
options:(NSStringDrawingUsesLineFragmentOrigin)
context:nil].size;

if (fitSize.width == 0 || fitSize.height == 0) {
Expand Down Expand Up @@ -364,7 +364,7 @@ static CGSize _calculateStringSize(NSAttributedString *str, id font, CGSize *con

CGSize dim;
dim = [str boundingRectWithSize:CGSizeMake(textRect.width, textRect.height)
options:(NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading)
options:(NSStringDrawingUsesLineFragmentOrigin)
context:nil].size;

dim.width = ceilf(dim.width);
Expand Down