gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set colour for cairo text drawing.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@28964 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-11-06 09:58:09 +00:00
parent 6a453d533c
commit ebfac7ae21
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2009-11-05 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoGState.m: Set the colour for all text drawing.
2009-11-04 Fred Kiefer <FredKiefer@gmx.de>
* Source/gsc/GSGState.m (-setColor:state:): Don't handle alpha specially.

26
Source/cairo/CairoGState.m
View file

@ -367,6 +367,12 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
cairo_matrix_t saved_matrix;
cairo_matrix_t local_matrix;
NSPoint p = [path currentPoint];
device_color_t c;
c = strokeColor;
gsColorToRGB(&c);
// The underlying concept does not allow to determine if alpha is set or not.
cairo_set_source_rgba(_ct, c.field[0], c.field[1], c.field[2], c.field[AINDEX]);
cairo_get_matrix(_ct, &saved_matrix);
@ -411,12 +417,18 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
{
if (_ct)
{
GS_BEGINITEMBUF(c, length + 1, char);
GS_BEGINITEMBUF(chars, length + 1, char);
device_color_t c;
c = strokeColor;
gsColorToRGB(&c);
// The underlying concept does not allow to determine if alpha is set or not.
cairo_set_source_rgba(_ct, c.field[0], c.field[1], c.field[2], c.field[AINDEX]);
[self _setPoint];
memcpy(c, string, length);
c[length] = 0;
cairo_show_text(_ct, c);
memcpy(chars, string, length);
chars[length] = 0;
cairo_show_text(_ct, chars);
GS_ENDITEMBUF();
}
}
@ -427,6 +439,12 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
{
cairo_matrix_t local_matrix;
NSAffineTransformStruct matrix = [ctm transformStruct];
device_color_t c;
c = strokeColor;
gsColorToRGB(&c);
// The underlying concept does not allow to determine if alpha is set or not.
cairo_set_source_rgba(_ct, c.field[0], c.field[1], c.field[2], c.field[AINDEX]);
[self _setPoint];
// FIXME: Hack to get font in rotated view working