New system colour methods.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20789 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2005-02-24 01:06:13 +00:00
parent 381013343b
commit af47cf9378
3 changed files with 45 additions and 1 deletions

View file

@ -1,3 +1,16 @@
2005-02-23 Fred Kiefer <FredKiefer@gmx.de>
* Header/AppKit/NSColor.h (-alternateSelectedControlColor,
-alternateSelectedControlTextColor,
-secondarySelectedControlColor,
controlAlternatingRowBackgroundColors): New MacOSX system colour methods.
* Source/NSColor.m (-alternateSelectedControlColor,
-alternateSelectedControlTextColor,
-secondarySelectedControlColor,
controlAlternatingRowBackgroundColors): Implemented the new
methods.
(initSystemColors): Added default values for new system coloure methods
2005-02-21 Fred Kiefer <FredKiefer@gmx.de> 2005-02-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSCell.m (-initWithCoder): * Source/NSCell.m (-initWithCoder):

View file

@ -191,6 +191,8 @@ typedef enum _NSControlTint {
// //
// System colors stuff. // System colors stuff.
// //
+ (NSColor*) alternateSelectedControlColor;
+ (NSColor*) alternateSelectedControlTextColor;
+ (NSColor*) controlBackgroundColor; + (NSColor*) controlBackgroundColor;
+ (NSColor*) controlColor; + (NSColor*) controlColor;
+ (NSColor*) controlHighlightColor; + (NSColor*) controlHighlightColor;
@ -206,6 +208,7 @@ typedef enum _NSControlTint {
+ (NSColor*) keyboardFocusIndicatorColor; + (NSColor*) keyboardFocusIndicatorColor;
+ (NSColor*) knobColor; + (NSColor*) knobColor;
+ (NSColor*) scrollBarColor; + (NSColor*) scrollBarColor;
+ (NSColor*) secondarySelectedControlColor;
+ (NSColor*) selectedControlColor; + (NSColor*) selectedControlColor;
+ (NSColor*) selectedControlTextColor; + (NSColor*) selectedControlTextColor;
+ (NSColor*) selectedKnobColor; + (NSColor*) selectedKnobColor;
@ -220,6 +223,8 @@ typedef enum _NSControlTint {
+ (NSColor*) windowFrameColor; + (NSColor*) windowFrameColor;
+ (NSColor*) windowFrameTextColor; + (NSColor*) windowFrameTextColor;
+ (NSArray*) controlAlternatingRowBackgroundColors;
// Pattern colour // Pattern colour
- (NSImage*) patternImage; - (NSImage*) patternImage;
#endif #endif

View file

@ -186,7 +186,7 @@ void initSystemColors(void)
colorStrings = [[NSMutableDictionary alloc] colorStrings = [[NSMutableDictionary alloc]
initWithObjectsAndKeys: initWithObjectsAndKeys:
lightGray, @"controlBackgroundColor", lightGray, @"controlBackgroundColor",
lightGray, @"controlColor", lightGray, @"controlColor",
lightGray, @"controlHighlightColor", lightGray, @"controlHighlightColor",
white, @"controlLightHighlightColor", white, @"controlLightHighlightColor",
@ -214,6 +214,11 @@ void initSystemColors(void)
lightGray, @"windowBackgroundColor", lightGray, @"windowBackgroundColor",
black, @"windowFrameColor", black, @"windowFrameColor",
white, @"windowFrameTextColor", white, @"windowFrameTextColor",
black, @"alternateSelectedControlColor",
white, @"alternateSelectedControlTextColor",
white, @"rowBackgroundColor",
lightGray, @"alternateRowBackgroundColor",
lightGray, @"secondarySelectedControlColor",
//gray, @"windowFrameColor", //gray, @"windowFrameColor",
//black, @"windowFrameTextColor", //black, @"windowFrameTextColor",
nil]; nil];
@ -573,6 +578,16 @@ systemColorWithName(NSString *name)
// //
// System colors stuff. // System colors stuff.
// //
+ (NSColor*) alternateSelectedControlColor
{
return systemColorWithName(@"alternateSelectedControlColor");
}
+ (NSColor*) alternateSelectedControlTextColor
{
return systemColorWithName(@"alternateSelectedControlTextColor");
}
+ (NSColor*) controlBackgroundColor + (NSColor*) controlBackgroundColor
{ {
return systemColorWithName(@"controlBackgroundColor"); return systemColorWithName(@"controlBackgroundColor");
@ -648,6 +663,11 @@ systemColorWithName(NSString *name)
return systemColorWithName(@"scrollBarColor"); return systemColorWithName(@"scrollBarColor");
} }
+ (NSColor*) secondarySelectedControlColor
{
return systemColorWithName(@"secondarySelectedControlColor");
}
+ (NSColor*) selectedControlColor + (NSColor*) selectedControlColor
{ {
return systemColorWithName(@"selectedControlColor"); return systemColorWithName(@"selectedControlColor");
@ -713,6 +733,12 @@ systemColorWithName(NSString *name)
return systemColorWithName(@"windowFrameTextColor"); return systemColorWithName(@"windowFrameTextColor");
} }
+ (NSArray*) controlAlternatingRowBackgroundColors
{
return [NSArray arrayWithObjects: systemColorWithName(@"rowBackgroundColor"),
systemColorWithName(@"alternateRowBackgroundColor"), nil];
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// Instance methods // Instance methods