gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed system fonts of size 12 to 0. This will use Nicolas font

Browse source 
cache and keep font sizes consistent when changed.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7347 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2000-09-02 17:16:26 +00:00
parent 9dd0f9c269
commit d3c10d80e7
11 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/NSBrowser.m
View file

@ -184,7 +184,7 @@
[self setTextColor: [NSColor windowFrameTextColor]]; [self setTextColor: [NSColor windowFrameTextColor]];
[self setBackgroundColor: [NSColor controlShadowColor]]; [self setBackgroundColor: [NSColor controlShadowColor]];
[self setFont: [NSFont titleBarFontOfSize:12]]; [self setFont: [NSFont titleBarFontOfSize: 0]];
_cell.is_editable = NO; _cell.is_editable = NO;
_cell.is_bezeled = YES; _cell.is_bezeled = YES;
_cell.text_align = NSCenterTextAlignment; _cell.text_align = NSCenterTextAlignment;

2
Source/NSFontPanel.m
View file

@ -405,7 +405,7 @@ float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
// label for selection of size // label for selection of size
label = [[NSTextField alloc] initWithFrame: l3]; label = [[NSTextField alloc] initWithFrame: l3];
[label setFont: [NSFont boldSystemFontOfSize: 12]]; [label setFont: [NSFont boldSystemFontOfSize: 0]];
[label setAlignment: NSCenterTextAlignment]; [label setAlignment: NSCenterTextAlignment];
[label setDrawsBackground: YES]; [label setDrawsBackground: YES];
[label setEditable: NO]; [label setEditable: NO];

2
Source/NSLayoutManager.m
View file

@ -1098,7 +1098,7 @@ Ghiradelli chocolate to he who puts all the pieces together : ) */
int startIndex; int startIndex;
NSRect firstProposedRect; NSRect firstProposedRect;
NSRect secondProposedRect; NSRect secondProposedRect;
NSFont *default_font = [NSFont systemFontOfSize: 12.0]; NSFont *default_font = [NSFont systemFontOfSize: 0];
int widthOfString; int widthOfString;
NSSize rSize; NSSize rSize;
NSCharacterSet *selectionParagraphGranularitySet = [NSCharacterSet characterSetWithCharactersInString: @"\n"]; NSCharacterSet *selectionParagraphGranularitySet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];

2
Source/NSMenu.m
View file

@ -1366,7 +1366,7 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
// Draw the title. // Draw the title.
[[NSColor windowFrameTextColor] set]; [[NSColor windowFrameTextColor] set];
[[NSFont boldSystemFontOfSize: 12] set]; [[NSFont boldSystemFontOfSize: 0] set];
PSmoveto(rect.origin.x + 7, rect.origin.y + 7); PSmoveto(rect.origin.x + 7, rect.origin.y + 7);
PSshow([[menu title] cString]); PSshow([[menu title] cString]);

8
Source/NSMenuItemCell.m
View file

@ -178,10 +178,10 @@ static NSImage *arrowImageH = nil;
} }
else else
{ {
mcell_titleWidth = [[NSFont menuFontOfSize:12] NSFont *defFont = [NSFont menuFontOfSize: 0];
widthOfString:[mcell_item title]];
mcell_keyEquivalentWidth = [[NSFont menuFontOfSize:12] mcell_titleWidth = [defFont widthOfString:[mcell_item title]];
widthOfString:[mcell_item keyEquivalent]]; mcell_keyEquivalentWidth = [defFont widthOfString:[mcell_item keyEquivalent]];
} }
// Submenu Arrow // Submenu Arrow

2
Source/NSMenuView.m
View file

@ -416,7 +416,7 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
unsigned i; unsigned i;
unsigned howMany = [menuv_itemCells count]; unsigned howMany = [menuv_itemCells count];
float howHigh = (howMany * cellSize.height); float howHigh = (howMany * cellSize.height);
float neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 12] float neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 0]
widthOfString: [menuv_menu title]] + 17; widthOfString: [menuv_menu title]] + 17;
float neededKeyEquivalentWidth = 0.0; float neededKeyEquivalentWidth = 0.0;
float neededStateImageWidth = 0.0; float neededStateImageWidth = 0.0;

4
Source/NSPanel.m
View file

@ -347,7 +347,7 @@ static const float ButtonInterspace = 10.0;
static const float ButtonMinHeight = 24.0; static const float ButtonMinHeight = 24.0;
static const float ButtonMinWidth = 72.0; static const float ButtonMinWidth = 72.0;
#define MessageFont [NSFont systemFontOfSize: 14.0] #define MessageFont [NSFont messageFontOfSize: 14]
// TODO: Check on NeXTSTEP, I think that the message font size is only 12.0. // TODO: Check on NeXTSTEP, I think that the message font size is only 12.0.
+ (void) initialize + (void) initialize
@ -432,7 +432,7 @@ makeScrollViewWithRect(NSRect rect)
[button setTitle: @""]; [button setTitle: @""];
[button setTarget: self]; [button setTarget: self];
[button setAction: @selector(buttonAction: )]; [button setAction: @selector(buttonAction: )];
[button setFont: [NSFont systemFontOfSize: 12.0]]; [button setFont: [NSFont systemFontOfSize: 0]];
return button; return button;
} }

2
Source/NSStringDrawing.m
View file

@ -95,7 +95,7 @@ checkInit()
* These defaults could change during the running of the program if the * These defaults could change during the running of the program if the
* user defaults are changed. * user defaults are changed.
*/ */
defFont = [NSFont userFontOfSize: 12]; defFont = [NSFont userFontOfSize: 0];
defFgCol = [NSColor textColor]; defFgCol = [NSColor textColor];
} }

2
Source/NSTabView.m
View file

@ -45,7 +45,7 @@
// setup variables // setup variables
tab_items = [NSMutableArray new]; tab_items = [NSMutableArray new];
tab_font = RETAIN([NSFont systemFontOfSize: 12]); tab_font = RETAIN([NSFont systemFontOfSize: 0]);
tab_selected = nil; tab_selected = nil;
return self; return self;

2
Source/NSTableHeaderCell.m
View file

@ -46,7 +46,7 @@ static NSColor *clearCol = nil;
_cell.text_align = NSCenterTextAlignment; _cell.text_align = NSCenterTextAlignment;
ASSIGN (_text_color, [NSColor windowFrameTextColor]); ASSIGN (_text_color, [NSColor windowFrameTextColor]);
[self setBackgroundColor: [NSColor controlShadowColor]]; [self setBackgroundColor: [NSColor controlShadowColor]];
[self setFont: [NSFont titleBarFontOfSize:12]]; [self setFont: [NSFont titleBarFontOfSize: 0]];
_cell.is_bezeled = YES; _cell.is_bezeled = YES;
_textfieldcell_draws_background = YES; _textfieldcell_draws_background = YES;

2
Source/NSText.m
View file

@ -3318,7 +3318,7 @@ other than copy/paste or dragging. */
{ {
return [NSDictionary dictionaryWithObjectsAndKeys: return [NSDictionary dictionaryWithObjectsAndKeys:
[NSParagraphStyle defaultParagraphStyle], NSParagraphStyleAttributeName, [NSParagraphStyle defaultParagraphStyle], NSParagraphStyleAttributeName,
[NSFont userFontOfSize: 12], NSFontAttributeName, [NSFont userFontOfSize: 0], NSFontAttributeName,
[NSColor textColor], NSForegroundColorAttributeName, [NSColor textColor], NSForegroundColorAttributeName,
nil]; nil];
} }