mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-25 01:11:04 +00:00
Made all predefined fonts redefinable and removed #ifdef.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8270 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
e5b2b6795f
commit
86b501a3ce
1 changed files with 90 additions and 8 deletions
|
@ -210,39 +210,121 @@ setNSFont(NSString* key, NSFont* font)
|
|||
|
||||
/* Getting various fonts*/
|
||||
|
||||
#ifndef STRICT_OPENSTEP
|
||||
+ (NSFont*) controlContentFontOfSize: (float)fontSize
|
||||
{
|
||||
return [NSFont fontWithName: @"Helvetica" size: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSControlContentFont", @"Helvetica", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (userCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSControlContentFont", @"Helvetica", 0));
|
||||
userCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSFont*) menuFontOfSize: (float)fontSize
|
||||
{
|
||||
return [NSFont fontWithName: @"Helvetica" size: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSMenuFont", @"Helvetica", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (userCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSMenuFont", @"Helvetica", 0));
|
||||
userCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSFont*) titleBarFontOfSize: (float)fontSize
|
||||
{
|
||||
return [self boldSystemFontOfSize: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSTitelBarFont", @"Helvetica-Bold", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (boldSystemCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSTitleBarFont", @"Helvetica-Bold", 0));
|
||||
boldSystemCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSFont*) messageFontOfSize: (float)fontSize
|
||||
{
|
||||
return [self systemFontOfSize: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSMessageFont", @"Helvetica", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (userCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSMessageFont", @"Helvetica", 0));
|
||||
userCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSFont*) paletteFontOfSize: (float)fontSize
|
||||
{
|
||||
// Not sure on this one.
|
||||
return [self boldSystemFontOfSize: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSPaletteFont", @"Helvetica-Bold", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (boldSystemCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSPaletteFont", @"Helvetica-Bold", 0));
|
||||
boldSystemCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSFont*) toolTipsFontOfSize: (float)fontSize
|
||||
{
|
||||
// Not sure on this one.
|
||||
return [NSFont fontWithName: @"Helvetica" size: fontSize];
|
||||
static NSFont *font = nil;
|
||||
|
||||
if (fontSize != 0)
|
||||
{
|
||||
return getNSFont (@"NSToolTipsFont", @"Helvetica", fontSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((font == nil) || (userCacheNeedsRecomputing == YES))
|
||||
{
|
||||
ASSIGN (font, getNSFont (@"NSToolTipsFont", @"Helvetica", 0));
|
||||
userCacheNeedsRecomputing = NO;
|
||||
}
|
||||
return font;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
- (id) initWithName: (NSString*)name matrix: (const float*)fontMatrix
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue