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

Minor tidyups ... nothing functional

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14587 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-09-27 08:26:13 +00:00
parent 3677175985
commit ab43ceed49
2 changed files with 64 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/NSFontManager.m
View file

@ -138,7 +138,9 @@ static Class fontPanelClass = Nil;
NSString *name = [fontsList objectAtIndex: i];
if ([self _includeFont: name])
[fontNames addObject: name];
{
[fontNames addObject: name];
}
}
return fontNames;
@ -159,7 +161,7 @@ static Class fontPanelClass = Nil;
for (i = 0; i < [fontFamilies count]; i++)
{
NSArray *fontDefs = [self availableMembersOfFontFamily:
[fontFamilies objectAtIndex: i]];
[fontFamilies objectAtIndex: i]];
for (j = 0; j < [fontDefs count]; j++)
{
@ -193,7 +195,9 @@ static Class fontPanelClass = Nil;
NSString *name = [fontDef objectAtIndex: 0];
if ([self _includeFont: name])
[fonts addObject: fontDef];
{
[fonts addObject: fontDef];
}
}
return fonts;
@ -220,7 +224,9 @@ static Class fontPanelClass = Nil;
_multiple = flag;
// The panel should also know if multiple changed
if (fontPanel != nil)
[fontPanel setPanelFont: fontObject isMultiple: flag];
{
[fontPanel setPanelFont: fontObject isMultiple: flag];
}
}
return;
}
@ -229,7 +235,9 @@ static Class fontPanelClass = Nil;
ASSIGN(_selectedFont, fontObject);
if (fontPanel != nil)
[fontPanel setPanelFont: fontObject isMultiple: flag];
{
[fontPanel setPanelFont: fontObject isMultiple: flag];
}
if (_fontMenu != nil)
{
@ -495,12 +503,12 @@ static Class fontPanelClass = Nil;
else if (trait == NSUnboldFontMask)
{
return [self convertFont: fontObject
toNotHaveTrait: NSBoldFontMask];
toNotHaveTrait: NSBoldFontMask];
}
else if (trait == NSUnitalicFontMask)
{
return [self convertFont: fontObject
toNotHaveTrait: NSItalicFontMask];
toNotHaveTrait: NSItalicFontMask];
}
else
{
@ -535,10 +543,13 @@ static Class fontPanelClass = Nil;
// This is a bit strange but is stated in the specification
if (trait & NSUnboldFontMask)
{
trait = (trait | NSBoldFontMask) & ~NSUnboldFontMask;
}
if (trait & NSUnitalicFontMask)
{
trait = (trait | NSItalicFontMask) & ~NSUnitalicFontMask;
}
if (!(t & trait))
{
// If already do not have that trait then just return it
@ -555,8 +566,9 @@ static Class fontPanelClass = Nil;
// We cannot reuse the weight in an unbold
if (trait & NSBoldFontMask)
weight = 5;
{
weight = 5;
}
t &= ~trait;
newFont = [self fontWithFamily: family
traits: t
@ -653,8 +665,8 @@ static Class fontPanelClass = Nil;
NSArray *fontDef = [fontDefs objectAtIndex: i];
int w1 = [[fontDef objectAtIndex: 2] intValue];
if (w1 < w && w1 > next_w &&
[[fontDef objectAtIndex: 3] unsignedIntValue] == trait)
if (w1 < w && w1 > next_w
&& [[fontDef objectAtIndex: 3] unsignedIntValue] == trait)
{
next_w = w1;
fontName = [fontDef objectAtIndex: 0];
@ -671,8 +683,8 @@ static Class fontPanelClass = Nil;
NSArray *fontDef = [fontDefs objectAtIndex: i];
int w1 = [[fontDef objectAtIndex: 2] intValue];
if (w1 < w && w1 > next_w &&
[[fontDef objectAtIndex: 3] unsignedIntValue] == trait)
if (w1 < w && w1 > next_w
&& [[fontDef objectAtIndex: 3] unsignedIntValue] == trait)
{
next_w = w1;
fontName = [fontDef objectAtIndex: 0];
@ -682,9 +694,10 @@ static Class fontPanelClass = Nil;
}
if (fontName != nil)
newFont = [NSFont fontWithName: fontName
size: size];
{
newFont = [NSFont fontWithName: fontName
size: size];
}
if (newFont == nil)
return fontObject;
else