From d36eb9b30f9eb97f0897cc3375f1b154823e3046 Mon Sep 17 00:00:00 2001 From: Manolo Gouy <Manolo> Date: Tue, 13 Apr 2010 17:44:52 +0000 Subject: [PATCH] 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 --- src/gl_draw.cxx | 3 +++ 1 file changed, 3 insertions(+) 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); -- GitLab