macOS: fixed problem in resizing of widget-containing OpenGL 3 window.

fltk · Oct 1, 2022 · 4196daa · 4196daa
1 parent 0627213
commit 4196daa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
@@ -262,7 +262,6 @@ void Fl_Gl_Window::resize(int X,int Y,int W,int H) {
   if (is_a_resize) valid(0);
   pGlWindowDriver->resize(is_a_resize, W, H);
   Fl_Window::resize(X,Y,W,H);
-  //pGlWindowDriver->resize(is_a_resize, W, H);//essai
 }
 
 /**

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
@@ -322,10 +322,10 @@ static void remove_gl_context_opacity(NSOpenGLContext *ctx) {
 }
 
 void Fl_Cocoa_Gl_Window_Driver::apply_scissor() {
+  if (glIsEnabled(GL_SCISSOR_TEST)) glDisable(GL_SCISSOR_TEST);
   CGRect *extents = Fl_Cocoa_Window_Driver::driver(pWindow)->subRect();
   if (extents) {
     remove_gl_context_opacity((NSOpenGLContext*)pWindow->context());
-    glDisable(GL_SCISSOR_TEST);
     GLdouble vals[4];
     glGetDoublev(GL_COLOR_CLEAR_VALUE, vals);
     glClearColor(0., 0., 0., 0.);