gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 15:10:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ask the delegate whether a font should be included in the font panel in NSFontPanel, not when returning fonts from NSFontManager.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17980 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2003-10-26 14:25:13 +00:00
parent ff4a8a21fa
commit 919b2b10a0
3 changed files with 109 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Source/NSFontManager.m
View file

@ -49,9 +49,6 @@ static NSFontPanel *fontPanel = nil;
static Class fontManagerClass = Nil;
static Class fontPanelClass = Nil;
@interface NSFontManager (GNUstepPrivate)
- (BOOL) _includeFont: (NSString*)fontName;
@end
@implementation NSFontManager
@ -125,22 +122,7 @@ static Class fontPanelClass = Nil;
*/
- (NSArray*) availableFonts
{
unsigned int i;
NSArray *fontsList = [_fontEnumerator availableFonts];
NSMutableArray *fontNames = [NSMutableArray
arrayWithCapacity: [fontsList count]];
for (i = 0; i < [fontsList count]; i++)
{
NSString *name = [fontsList objectAtIndex: i];
if ([self _includeFont: name])
{
[fontNames addObject: name];
}
}
return fontNames;
return [_fontEnumerator availableFonts];
}
- (NSArray*) availableFontFamilies
@ -167,12 +149,7 @@ static Class fontPanelClass = Nil;
traits = [[fontDef objectAtIndex: 3] unsignedIntValue];
// Check if the font has exactly the given mask
if (traits == fontTraitMask)
{
NSString *name = [fontDef objectAtIndex: 0];
if ([self _includeFont: name])
[fontNames addObject: name];
}
[fontNames addObject: [fontDef objectAtIndex: 0]];
}
}
@ -181,23 +158,7 @@ static Class fontPanelClass = Nil;
- (NSArray*) availableMembersOfFontFamily: (NSString*)family
{
unsigned int i;
NSArray *fontsList = [_fontEnumerator availableMembersOfFontFamily: family];
NSMutableArray *fonts = [NSMutableArray
arrayWithCapacity: [fontsList count]];
for (i = 0; i < [fontsList count]; i++)
{
NSArray *fontDef = [fontsList objectAtIndex: i];
NSString *name = [fontDef objectAtIndex: 0];
if ([self _includeFont: name])
{
[fonts addObject: fontDef];
}
}
return fonts;
return [_fontEnumerator availableMembersOfFontFamily: family];
}
- (NSString*) localizedNameForFamily: (NSString*)family
@ -997,18 +958,3 @@ static Class fontPanelClass = Nil;
@end
@implementation NSFontManager (GNUstepPrivate)
/*
* Ask delegate if to include a font
*/
- (BOOL) _includeFont: (NSString*)fontName
{
if ((_delegate != nil)
&& [_delegate respondsToSelector: @selector(fontManager: willIncludeFont:)])
return [_delegate fontManager: self willIncludeFont: fontName];
else
return YES;
}
@end