summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-04-13 17:44:52 +0000
committerManolo Gouy <Manolo>2010-04-13 17:44:52 +0000
commitd36eb9b30f9eb97f0897cc3375f1b154823e3046 (patch)
treee74b45961685dfe1378263e271905937f409ec2a /src
parentc5352b84cc879b63ccf9ca1991b49aab5591ef91 (diff)
gl_draw.cxx (Mac-specific): account for text color.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7493 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/gl_draw.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 99f7214fa..52222b4fc 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -486,6 +486,9 @@ int gl_texture_fifo::compute_texture(const char* str, int n)
fl_gc = CGBitmapContextCreate(base, fifo[current].width, fifo[current].height, 8, fifo[current].width*4, lut, kCGImageAlphaPremultipliedLast);
CGColorSpaceRelease(lut);
fl_fontsize = gl_fontsize;
+ GLfloat colors[4];
+ glGetFloatv(GL_CURRENT_COLOR, colors);
+ fl_color(colors[0]*255, colors[1]*255, colors[2]*255);
fl_draw(str, 0, fifo[current].height - fl_descent());
//put this bitmap in a texture
glPushAttrib(GL_TEXTURE_BIT);