gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 10:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug reading colors

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3571 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-01-18 05:35:14 +00:00
parent a1947434d8
commit 92eef2512b
2 changed files with 82 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Jan 18 5:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSColor.m: Fixed error in decoding color from defaults
string - was only reading the first (red) color component.
Fri Jan 15 10:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Fri Jan 15 10:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSPasteboard.m: Removed unused (and erroneous) header. * Source/NSPasteboard.m: Removed unused (and erroneous) header.

34
Source/NSColor.m
View file

@ -1133,30 +1133,15 @@ static NSMutableDictionary *colorStrings = nil;
+ (NSColor*) colorFromString: (NSString*)str + (NSColor*) colorFromString: (NSString*)str
{ {
id plist = [str propertyList]; if ([str hasPrefix: @"{"])
{
NSDictionary *dict; NSDictionary *dict;
NSString *space; NSString *space;
float alpha; float alpha;
if (plist == nil) dict = [str propertyList];
if (dict == nil)
return nil; return nil;
if ([plist isKindOfClass: [NSString class]] == YES)
{
const char *str = [(NSString*)plist cString];
float r, g, b;
sscanf(str, "%f %f %f", &r, &g, &b);
return [self colorWithCalibratedRed: r
green: g
blue: b
alpha: 0];
}
if ([plist isKindOfClass: [NSDictionary class]] == NO)
return nil;
dict = (NSDictionary*)plist;
if ((space = [dict objectForKey: @"ColorSpace"]) == nil) if ((space = [dict objectForKey: @"ColorSpace"]) == nil)
return nil; return nil;
@ -1221,7 +1206,18 @@ static NSMutableDictionary *colorStrings = nil;
return [self colorWithCatalogName: cat return [self colorWithCatalogName: cat
colorName: col]; colorName: col];
} }
}
else if (str)
{
const char *ptr = [str cString];
float r, g, b;
sscanf(ptr, "%f %f %f", &r, &g, &b);
return [self colorWithCalibratedRed: r
green: g
blue: b
alpha: 0];
}
return nil; return nil;
} }