mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gl_draw() used in simple window under Mac OS X.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11719 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-05-08 16:20:24 +00:00
parent 8fcccb05d4
commit 8813f93ac1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gl_draw.cxx
View File

@ -369,7 +369,8 @@ static int has_texture_rectangle = 0; // true means GL_EXT_texture_rectangle is
#include <FL/glu.h> // for gluUnProject() and gluCheckExtension()
#include <FL/glut.H> // for glutStrokeString() and glutStrokeLength()
#include <src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h>
#include <src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H>
#include <src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H>
// manages a fifo pile of pre-computed string textures
class gl_texture_fifo {
@ -554,7 +555,13 @@ static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class inst
// draws a utf8 string using pre-computed texture if available
void Fl_Cocoa_Gl_Window_Driver::draw_string(const char* str, int n)
{
gl_scale = Fl_Window::current()->as_gl_window()->pixels_per_unit();
Fl_Window *win = Fl_Window::current();
if (win->as_gl_window())
gl_scale = win->as_gl_window()->pixels_per_unit();
else
gl_scale = (fl_mac_os_version >= 100700 && win->shown() &&
Fl_Cocoa_Window_Driver::driver(win)->mapped_to_retina()) ? 2 : 1;
//fprintf(stderr,"gl_scale=%d\n",gl_scale);
if (! gl_fifo) gl_fifo = new gl_texture_fifo();
if (!gl_fifo->textures_generated) {