dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-03-27 23:39:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace deprecated sizeWithFont with sizeWithAttributes

Browse Source
This commit is contained in:
Scott Ludwig 2016-01-03 23:21:34 -08:00
parent a95a89826b
commit 324a5bc3fb
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/iphone/chatcell.mm
View File

@ -39,7 +39,11 @@
chatLabel_.frame = frame;
nameLabel_.text = user;
frame = nameLabel_.frame;
frame.size = [user sizeWithFont:nameLabel_.font];
CGSize sizeFont = [user sizeWithAttributes:@{NSFontAttributeName: nameLabel_.font}];
frame.size.height = ceilf(sizeFont.height);
frame.size.width = ceilf(sizeFont.width);
nameLabel_.frame = frame;
// length 0 means system message

21
game/iphone/chatviewcontroller.mm
View File

@ -31,8 +31,8 @@
suspended_ = NO;
chatEntries_ = [[NSMutableArray alloc] initWithCapacity:CHAT_HISTORY];
entryFont_ = [UIFont systemFontOfSize:12];
CGSize size10Spaces = [@" " sizeWithFont:entryFont_];
width10Spaces_ = size10Spaces.width;
CGSize size10Spaces = [@" " sizeWithAttributes:@{NSFontAttributeName: entryFont_}];
width10Spaces_ = ceilf(size10Spaces.width);
chatc_ = NULL;
title_ = @"Chat";
[title_ retain];
@ -458,8 +458,8 @@
// Insert spaces into chat so that user's name can draw into that
// space with a different UILabel. Hack-o-rama.
CGSize sizeUser = [newUser sizeWithFont:entryFont_];
CGFloat ratio = sizeUser.width / width10Spaces_;
CGSize sizeUser = [newUser sizeWithAttributes:@{NSFontAttributeName: entryFont_}];
CGFloat ratio = ceilf(sizeUser.width) / width10Spaces_;
int countSpaces = ceil(ratio * 10.0) + 2;
char szSpaces[256];
@ -535,12 +535,15 @@
// Calculate what the height is, cache it, return it
NSString *chat = (NSString *)[entry objectForKey:@"chat"];
CGSize sizeBox = CGSizeMake(width, 2800);
CGSize size = [chat sizeWithFont:entryFont_ constrainedToSize:sizeBox
lineBreakMode:UILineBreakModeWordWrap];
value = [NSString stringWithFormat:@"%d", (int)size.height];
CGRect rect = [chat boundingRectWithSize:CGSizeMake(width, CGFLOAT_MAX)
options: NSStringDrawingUsesLineFragmentOrigin
attributes: @{ NSFontAttributeName: entryFont_ }
context:nil];
CGFloat height = ceilf(rect.size.height);
value = [NSString stringWithFormat:@"%d", (int)height];
[entry setObject:value forKey:key];
return size.height;
return height;
}
- (void)doClear