Skip to content
Snippets Groups Projects
Commit d36eb9b3 authored by Manolo Gouy's avatar Manolo Gouy
Browse files

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
parent c5352b84
Branches
Tags
No related merge requests found
...@@ -486,6 +486,9 @@ int gl_texture_fifo::compute_texture(const char* str, int n) ...@@ -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); fl_gc = CGBitmapContextCreate(base, fifo[current].width, fifo[current].height, 8, fifo[current].width*4, lut, kCGImageAlphaPremultipliedLast);
CGColorSpaceRelease(lut); CGColorSpaceRelease(lut);
fl_fontsize = gl_fontsize; 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()); fl_draw(str, 0, fifo[current].height - fl_descent());
//put this bitmap in a texture //put this bitmap in a texture
glPushAttrib(GL_TEXTURE_BIT); glPushAttrib(GL_TEXTURE_BIT);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment