gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-30 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct stroke colour handling.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@28948 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-11-03 22:52:28 +00:00
parent feccdb5cd8
commit 2ee4f99adb
3 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Source/art/ARTGState.m
View file

@ -52,7 +52,8 @@ draw_info_t ART_DI;
unsigned char r,g,b;
[super setColor: color state: cState];
if (cState&(COLOR_FILL|COLOR_STROKE))
if (cState & COLOR_FILL)
{
c = fillColor;
gsColorToRGB(&c); /* TODO: check this */
@ -66,20 +67,30 @@ draw_info_t ART_DI;
if (c.field[2] < 0.0) c.field[2] = 0.0;
b = c.field[2] * 255;
if (cState & COLOR_FILL)
{
fill_color[0] = r;
fill_color[1] = g;
fill_color[2] = b;
fill_color[3] = fillColor.field[AINDEX] * 255;
}
if (cState & COLOR_STROKE)
{
stroke_color[0] = r;
stroke_color[1] = g;
stroke_color[2] = b;
stroke_color[3] = strokeColor.field[AINDEX] * 255;
}
fill_color[0] = r;
fill_color[1] = g;
fill_color[2] = b;
fill_color[3] = fillColor.field[AINDEX] * 255;
}
if (cState & COLOR_STROKE)
{
c = strokeColor;
gsColorToRGB(&c); /* TODO: check this */
if (c.field[0] > 1.0) c.field[0] = 1.0;
if (c.field[0] < 0.0) c.field[0] = 0.0;
r = c.field[0] * 255;
if (c.field[1] > 1.0) c.field[1] = 1.0;
if (c.field[1] < 0.0) c.field[1] = 0.0;
g = c.field[1] * 255;
if (c.field[2] > 1.0) c.field[2] = 1.0;
if (c.field[2] < 0.0) c.field[2] = 0.0;
b = c.field[2] * 255;
stroke_color[0] = r;
stroke_color[1] = g;
stroke_color[2] = b;
stroke_color[3] = strokeColor.field[AINDEX] * 255;
}
}