mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 06:51:44 +00:00
Changed system fonts of size 12 to 0. This will use Nicolas font
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:
parent
6792f04451
commit
a3333bd2e3
11 changed files with 15 additions and 15 deletions
|
@ -184,7 +184,7 @@
|
|||
|
||||
[self setTextColor: [NSColor windowFrameTextColor]];
|
||||
[self setBackgroundColor: [NSColor controlShadowColor]];
|
||||
[self setFont: [NSFont titleBarFontOfSize:12]];
|
||||
[self setFont: [NSFont titleBarFontOfSize: 0]];
|
||||
_cell.is_editable = NO;
|
||||
_cell.is_bezeled = YES;
|
||||
_cell.text_align = NSCenterTextAlignment;
|
||||
|
|
|
@ -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 = [[NSTextField alloc] initWithFrame: l3];
|
||||
[label setFont: [NSFont boldSystemFontOfSize: 12]];
|
||||
[label setFont: [NSFont boldSystemFontOfSize: 0]];
|
||||
[label setAlignment: NSCenterTextAlignment];
|
||||
[label setDrawsBackground: YES];
|
||||
[label setEditable: NO];
|
||||
|
|
|
@ -1098,7 +1098,7 @@ Ghiradelli chocolate to he who puts all the pieces together : ) */
|
|||
int startIndex;
|
||||
NSRect firstProposedRect;
|
||||
NSRect secondProposedRect;
|
||||
NSFont *default_font = [NSFont systemFontOfSize: 12.0];
|
||||
NSFont *default_font = [NSFont systemFontOfSize: 0];
|
||||
int widthOfString;
|
||||
NSSize rSize;
|
||||
NSCharacterSet *selectionParagraphGranularitySet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];
|
||||
|
|
|
@ -1366,7 +1366,7 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
|
|||
|
||||
// Draw the title.
|
||||
[[NSColor windowFrameTextColor] set];
|
||||
[[NSFont boldSystemFontOfSize: 12] set];
|
||||
[[NSFont boldSystemFontOfSize: 0] set];
|
||||
PSmoveto(rect.origin.x + 7, rect.origin.y + 7);
|
||||
PSshow([[menu title] cString]);
|
||||
|
||||
|
|
|
@ -178,10 +178,10 @@ static NSImage *arrowImageH = nil;
|
|||
}
|
||||
else
|
||||
{
|
||||
mcell_titleWidth = [[NSFont menuFontOfSize:12]
|
||||
widthOfString:[mcell_item title]];
|
||||
mcell_keyEquivalentWidth = [[NSFont menuFontOfSize:12]
|
||||
widthOfString:[mcell_item keyEquivalent]];
|
||||
NSFont *defFont = [NSFont menuFontOfSize: 0];
|
||||
|
||||
mcell_titleWidth = [defFont widthOfString:[mcell_item title]];
|
||||
mcell_keyEquivalentWidth = [defFont widthOfString:[mcell_item keyEquivalent]];
|
||||
}
|
||||
|
||||
// Submenu Arrow
|
||||
|
|
|
@ -416,7 +416,7 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
|
|||
unsigned i;
|
||||
unsigned howMany = [menuv_itemCells count];
|
||||
float howHigh = (howMany * cellSize.height);
|
||||
float neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 12]
|
||||
float neededImageAndTitleWidth = [[NSFont boldSystemFontOfSize: 0]
|
||||
widthOfString: [menuv_menu title]] + 17;
|
||||
float neededKeyEquivalentWidth = 0.0;
|
||||
float neededStateImageWidth = 0.0;
|
||||
|
|
|
@ -347,7 +347,7 @@ static const float ButtonInterspace = 10.0;
|
|||
static const float ButtonMinHeight = 24.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.
|
||||
|
||||
+ (void) initialize
|
||||
|
@ -432,7 +432,7 @@ makeScrollViewWithRect(NSRect rect)
|
|||
[button setTitle: @""];
|
||||
[button setTarget: self];
|
||||
[button setAction: @selector(buttonAction: )];
|
||||
[button setFont: [NSFont systemFontOfSize: 12.0]];
|
||||
[button setFont: [NSFont systemFontOfSize: 0]];
|
||||
return button;
|
||||
}
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ checkInit()
|
|||
* These defaults could change during the running of the program if the
|
||||
* user defaults are changed.
|
||||
*/
|
||||
defFont = [NSFont userFontOfSize: 12];
|
||||
defFont = [NSFont userFontOfSize: 0];
|
||||
defFgCol = [NSColor textColor];
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
// setup variables
|
||||
|
||||
tab_items = [NSMutableArray new];
|
||||
tab_font = RETAIN([NSFont systemFontOfSize: 12]);
|
||||
tab_font = RETAIN([NSFont systemFontOfSize: 0]);
|
||||
tab_selected = nil;
|
||||
|
||||
return self;
|
||||
|
|
|
@ -46,7 +46,7 @@ static NSColor *clearCol = nil;
|
|||
_cell.text_align = NSCenterTextAlignment;
|
||||
ASSIGN (_text_color, [NSColor windowFrameTextColor]);
|
||||
[self setBackgroundColor: [NSColor controlShadowColor]];
|
||||
[self setFont: [NSFont titleBarFontOfSize:12]];
|
||||
[self setFont: [NSFont titleBarFontOfSize: 0]];
|
||||
_cell.is_bezeled = YES;
|
||||
_textfieldcell_draws_background = YES;
|
||||
|
||||
|
|
|
@ -3318,7 +3318,7 @@ other than copy/paste or dragging. */
|
|||
{
|
||||
return [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[NSParagraphStyle defaultParagraphStyle], NSParagraphStyleAttributeName,
|
||||
[NSFont userFontOfSize: 12], NSFontAttributeName,
|
||||
[NSFont userFontOfSize: 0], NSFontAttributeName,
|
||||
[NSColor textColor], NSForegroundColorAttributeName,
|
||||
nil];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue