Fixed general bug in GLJPanel where the offscreen image was being

drawn from within the GLEventListener rather than in a guaranteed
fashion from the AWT event queue thread within paintComponent(),
causing problems on OS X with the new GLWorkerThread


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@669 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 7 insertions, 2 deletions

diff --git a/src/classes/javax/media/opengl/GLJPanel.java b/src/classes/javax/media/opengl/GLJPanel.java
index 445ea3c4d..529b951a3 100644
--- a/src/classes/javax/media/opengl/GLJPanel.java
+++ b/src/classes/javax/media/opengl/GLJPanel.java
@@ -564,6 +564,11 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
       } else {
         drawableHelper.invokeGL(offscreenDrawable, offscreenContext, displayAction, initAction);
       }
+
+      if (offscreenImage != null) {
+        // Draw resulting image in one shot
+        g.drawImage(offscreenImage, 0, 0, offscreenImage.getWidth(), offscreenImage.getHeight(), this);
+      }
     }
   }
 
@@ -1038,8 +1043,8 @@ public class GLJPanel extends JPanel implements GLAutoDrawable {
               }
             }
 
-            // Draw resulting image in one shot
-            g.drawImage(offscreenImage, 0, 0, offscreenImage.getWidth(), offscreenImage.getHeight(), GLJPanel.this);
+	    // Note: image will be drawn back in paintComponent() for
+	    // correctness on all platforms
           }
         }
       } else {