CPFontManager weightOfFont: and traitsOfFont:.

This commit is contained in:
Alexander Ljungberg committed 2012-07-15 23:39:29 +01:00
1 parent 1e5bccd48e
commit 7f1b396ce8
2 files changed
+32

No files matched your search

+12
View File
@@ -148,6 +148,18 @@ var CPSharedFontManager = nil,
return _isMultiple;
}
- (int)weightOfFont:(CPFont)aFont
{
// TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
// precise than that.
return [aFont isBold] ? 9 : 5;
}
- (CPFontTraitMask)traitsOfFont:(CPFont)aFont
{
return ([aFont isBold] ? CPBoldFontMask : 0) | ([aFont isItalic] ? CPItalicFontMask : 0);
}
- (CPFont)convertFont:(CPFont)aFont
{
if (!_activeChange)
+20
View File
@@ -37,6 +37,26 @@
[self assertTrue:[fontManager isMultiple]];
}
- (void)testWeightOfFont_
{
var fontManager = [CPFontManager sharedFontManager];
[self assert:[fontManager weightOfFont:fontA] equals:5 message:@"standard font weight"];
fontB = [CPFont boldFontWithName:@"Helvetica" size:12.0 italic:YES];
[self assert:[fontManager weightOfFont:fontB] equals:9 message:@"bold font weight"];
}
- (void)testTraitsOfFont_
{
var fontManager = [CPFontManager sharedFontManager];
fontB = [CPFont boldFontWithName:@"Helvetica" size:12.0 italic:YES];
[self assert:[fontManager traitsOfFont:fontA] equals:0 message:@"fontA traits"];
[self assert:[fontManager traitsOfFont:fontB] equals:CPBoldFontMask | CPItalicFontMask message:@"fontB traits"];
}
- (void)testAddFontTrait_
{
var fontManager = [CPFontManager sharedFontManager];