clean up the last of the OpenGL file dialog shitshow

benfry · benfry · commit a0b2776be0a3 · 2015-09-19T16:33:24.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -6247,6 +6247,7 @@ public void selectOutput(String prompt, String callback) {
     selectOutput(prompt, callback, null);
   }
 
+
   public void selectOutput(String prompt, String callback, File file) {
     selectOutput(prompt, callback, file, this);
   }
@@ -6271,6 +6272,8 @@ static public void selectOutput(String prompt, String callbackMethod,
   }
 
 
+  // Will remove the 'sketch' parameter once we get an upstream JOGL fix
+  // https://github.com/processing/processing/issues/3831
   static protected void selectImpl(final String prompt,
                                    final String callbackMethod,
                                    final File defaultSelection,
@@ -6281,7 +6284,9 @@ static protected void selectImpl(final String prompt,
     EventQueue.invokeLater(new Runnable() {
       public void run() {
         File selectedFile = null;
-        boolean hide = sketch != null && sketch.g instanceof PGraphicsOpenGL && platform == WINDOWS;
+
+        boolean hide = (sketch != null) &&
+          (sketch.g instanceof PGraphicsOpenGL) && (platform == WINDOWS);
         if (hide) sketch.surface.setVisible(false);
 
         if (useNativeSelect) {
@@ -6355,6 +6360,8 @@ static public void selectFolder(final String prompt,
   }
 
 
+  // Will remove the 'sketch' parameter once we get an upstream JOGL fix
+  // https://github.com/processing/processing/issues/3831
   static public void selectFolder(final String prompt,
                                   final String callbackMethod,
                                   final File defaultSelection,
@@ -6365,7 +6372,8 @@ static public void selectFolder(final String prompt,
       public void run() {
         File selectedFile = null;
 
-        boolean hide = sketch != null && sketch.g instanceof PGraphicsOpenGL && platform == WINDOWS;
+        boolean hide = (sketch != null) &&
+          (sketch.g instanceof PGraphicsOpenGL) && (platform == WINDOWS);
         if (hide) sketch.surface.setVisible(false);
 
         if (platform == MACOSX && useNativeSelect != false) {
diff --git a/core/todo.txt b/core/todo.txt
@@ -16,10 +16,12 @@ X   https://github.com/processing/processing/issues/3825
 X   https://github.com/processing/processing/commit/42c0150da0f400637de916db1f94a687a7bc4288
 X surface.setLocation() causing a freeze on Windows
 X   https://github.com/processing/processing/commit/4c0f9234c0a48f62363233cafc9c9951ee351d3e
+X selectInput/Output() is behind the drawing window (Windows)
+X   https://github.com/processing/processing/issues/3775
 
-_ selectInput/Output() is behind the drawing window (Windows)
-_   https://github.com/processing/processing/issues/3775
-_   fixed has been added, test on Windows
+known
+_ window must close when using file dialogs with OpenGL on Windows
+_   https://github.com/processing/processing/issues/3831
 
 
 3.0 final
