mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 15:11:37 +00:00
allFonts returns GSFontInfo objects.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6425 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
e0cf43097e
commit
2bda7b65bd
3 changed files with 13 additions and 19 deletions
|
@ -1,3 +1,8 @@
|
|||
2000-04-06 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Source/GSFontInfo.m: allFonts returns GSFontInfo objects.
|
||||
[-pointSize]: Implement.
|
||||
|
||||
2000-04-01 18:00 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSText.m: Now really uses a text storage instead of an
|
||||
|
|
|
@ -79,9 +79,6 @@
|
|||
+ (GSFontInfo*) fontInfoForFontName: (NSString*)fontName
|
||||
matrix: (const float *)fmatrix;
|
||||
|
||||
- (GSFontInfo*) newTransformedFontInfoForMatrix: (const float*)fmatrix;
|
||||
- (void) transformUsingMatrix: (const float*)fmatrix;
|
||||
|
||||
- (NSDictionary *)afmDictionary;
|
||||
- (NSString *)afmFileContents;
|
||||
- (NSRect)boundingRectForFont;
|
||||
|
|
|
@ -80,8 +80,8 @@ static GSFontEnumerator *sharedEnumerator = nil;
|
|||
|
||||
for (i = 0; i < [fontsList count]; i++)
|
||||
{
|
||||
NSFont *font = (NSFont*)[fontsList objectAtIndex: i];
|
||||
NSString *name = [font fontName];
|
||||
GSFontInfo *font = (GSFontInfo*)[fontsList objectAtIndex: i];
|
||||
NSString *name = [font fontName];
|
||||
|
||||
if ([fontManager _includeFont: name])
|
||||
[fontNames addObject: name];
|
||||
|
@ -100,7 +100,7 @@ static GSFontEnumerator *sharedEnumerator = nil;
|
|||
fontFamilies = [NSMutableSet setWithCapacity: [fontsList count]];
|
||||
for (i = 0; i < [fontsList count]; i++)
|
||||
{
|
||||
NSFont *font = (NSFont*)[fontsList objectAtIndex: i];
|
||||
GSFontInfo *font = (GSFontInfo*)[fontsList objectAtIndex: i];
|
||||
|
||||
[fontFamilies addObject: [font familyName]];
|
||||
}
|
||||
|
@ -201,19 +201,6 @@ static GSFontEnumerator *sharedEnumerator = nil;
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (GSFontInfo*) newTransformedFontInfoForMatrix: (const float*)fmatrix
|
||||
{
|
||||
GSFontInfo* new = NSCopyObject(self, 0, [self zone]);
|
||||
|
||||
[new transformUsingMatrix: fmatrix];
|
||||
return AUTORELEASE(new);
|
||||
}
|
||||
|
||||
- (void) transformUsingMatrix: (const float*)matrix
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (NSDictionary*) afmDictionary
|
||||
{
|
||||
return fontDictionary;
|
||||
|
@ -244,6 +231,11 @@ static GSFontEnumerator *sharedEnumerator = nil;
|
|||
return familyName;
|
||||
}
|
||||
|
||||
- (float) pointSize
|
||||
{
|
||||
return matrix[0];
|
||||
}
|
||||
|
||||
- (NSString*) fontName
|
||||
{
|
||||
return fontName;
|
||||
|
|
Loading…
Reference in a new issue