From 01ceac46e9b4232dff8e2de8b999843bc77c9db2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 20 Sep 2003 18:45:55 +0000 Subject: Pixel format selection change (STR #175) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 +++ src/Fl_Gl_Choice.cxx | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 9c7330559..5e4269e62 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ CHANGES IN FLTK 1.1.5rc1 + - The Fl_Gl_Window WIN32 pixel format code did not + choose the pixel format with the largest depth buffer + (STR #175) - The configure script didn't leave space between the CFLAGS/CXXFLAGS and X_CFLAGS variables (STR #174) - The Fl_JPEG_Image and Fl_PNG_Image classes did not diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx index 2719f2ea6..6f587647b 100644 --- a/src/Fl_Gl_Choice.cxx +++ b/src/Fl_Gl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.15 2003/07/23 14:38:00 easysw Exp $" +// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.16 2003/09/20 18:45:55 easysw Exp $" // // OpenGL visual selection code for the Fast Light Tool Kit (FLTK). // @@ -181,8 +181,8 @@ Fl_Gl_Choice *Fl_Gl_Choice::find(int m, const int *alistp) { // offering overlay is better: if (!(chosen_pfd.bReserved & 15) && (pfd.bReserved & 15)) {} // otherwise more bit planes is better: - else if (chosen_pfd.cColorBits < pfd.cColorBits) {} - else continue; + else if (chosen_pfd.cColorBits > pfd.cColorBits) continue; + else if (chosen_pfd.cDepthBits > pfd.cDepthBits) continue; } pixelformat = i; chosen_pfd = pfd; @@ -347,5 +347,5 @@ void fl_delete_gl_context(GLContext context) { // -// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.15 2003/07/23 14:38:00 easysw Exp $". +// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.16 2003/09/20 18:45:55 easysw Exp $". // -- cgit v1.2.3