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

* Source/NSColor.m: Add alpha handling to keyed-coding/decoding.

Browse source 
Should fix bug #34501.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33965 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2011-10-11 20:57:24 +00:00
parent 8240c3bb55
commit b04bfd507a
2 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Source/NSColor.m
View file

@ -1426,6 +1426,7 @@ systemColorWithName(NSString *name)
[scanner scanFloat: &red];
[scanner scanFloat: &green];
[scanner scanFloat: &blue];
[scanner scanFloat: &alpha];
RELEASE(scanner);
RELEASE(str);
}
@ -1462,6 +1463,7 @@ systemColorWithName(NSString *name)
length: length];
scanner = [[NSScanner alloc] initWithString: str];
[scanner scanFloat: &white];
[scanner scanFloat: &alpha];
RELEASE(scanner);
RELEASE(str);
}
@ -1500,6 +1502,7 @@ systemColorWithName(NSString *name)
[scanner scanFloat: &yellow];
[scanner scanFloat: &magenta];
[scanner scanFloat: &black];
[scanner scanFloat: &alpha];
RELEASE(scanner);
RELEASE(str);
}
@ -2219,8 +2222,15 @@ static NSRecursiveLock *namedColorLock = nil;
{
[aCoder encodeInt: 4 forKey: @"NSColorSpace"];
}
// FIXME: Missing handling of alpha value
str = [[NSString alloc] initWithFormat: @"%f", _white_component];
if (_alpha_component == 1.0)
{
str = [[NSString alloc] initWithFormat: @"%f", _white_component];
}
else
{
str = [[NSString alloc] initWithFormat: @"%f %f", _white_component, _alpha_component];
}
[aCoder encodeBytes: (const uint8_t*)[str cString]
length: [str cStringLength]
forKey: @"NSWhite"];
@ -2526,10 +2536,19 @@ static NSRecursiveLock *namedColorLock = nil;
{
NSString *str;
// FIXME: Missing handling of alpha value
[aCoder encodeInt: 5 forKey: @"NSColorSpace"];
str = [[NSString alloc] initWithFormat: @"%f %f %f %f", _cyan_component,
_magenta_component, _yellow_component, _black_component];
if (_alpha_component == 1.0)
{
str = [[NSString alloc] initWithFormat: @"%f %f %f %f", _cyan_component,
_magenta_component, _yellow_component,
_black_component];
}
else
{
str = [[NSString alloc] initWithFormat: @"%f %f %f %f %f", _cyan_component,
_magenta_component, _yellow_component,
_black_component, _alpha_component];
}
[aCoder encodeBytes: (const uint8_t*)[str cString]
length: [str cStringLength]
forKey: @"NSCYMK"];
@ -2819,9 +2838,17 @@ static NSRecursiveLock *namedColorLock = nil;
{
[aCoder encodeInt: 2 forKey: @"NSColorSpace"];
}
// FIXME: Missing handling of alpha value
str = [[NSString alloc] initWithFormat: @"%f %f %f", _red_component,
_green_component, _blue_component];
if (_alpha_component == 1.0)
{
str = [[NSString alloc] initWithFormat: @"%f %f %f", _red_component,
_green_component, _blue_component];
}
else
{
str = [[NSString alloc] initWithFormat: @"%f %f %f %f", _red_component,
_green_component, _blue_component, _alpha_component];
}
[aCoder encodeBytes: (const uint8_t*)[str cString]
length: [str cStringLength]
forKey: @"NSRGB"];