diff options
author | phil <[email protected]> | 2016-10-31 11:02:17 +1300 |
---|---|---|
committer | phil <[email protected]> | 2016-10-31 11:02:17 +1300 |
commit | 35fbce47913919c4534e91fc29b3d620e347ca1a (patch) | |
tree | 9bb952c081384d02d07d3ab5f2b5edd83c956860 /src/main | |
parent | 371d7c008c087a8df354322605f2e2d37ea98fb1 (diff) |
Bug 1318 - JoglPipeline uses new Frame() for capabilities capture
this appears on the taskbar briefly.
Use of Frame replaced by Dialog
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java | 8 | ||||
-rw-r--r-- | src/main/java/org/jogamp/java3d/JoglPipeline.java | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java index c52bf09..3c97cd5 100644 --- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java +++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java @@ -24,11 +24,13 @@ package org.jogamp.java3d; import java.awt.BorderLayout; import java.awt.Canvas; +import java.awt.Dialog; import java.awt.EventQueue; import java.awt.Frame; import java.awt.GraphicsConfigTemplate; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; +import java.awt.Window; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -7504,7 +7506,7 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline // QueryCanvas // JOGL requires a visible Frame for an onscreen context - Frame f = new Frame(); + Dialog f = new Dialog(new Frame()); f.setUndecorated(true); f.setLayout(new BorderLayout()); @@ -8584,7 +8586,7 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline AWTGraphicsConfiguration awtConfig = null; while (tryAgain) { - Frame f = new Frame(); + Dialog f = new Dialog(new Frame()); f.setUndecorated(true); f.setLayout(new BorderLayout()); capturer = new CapabilitiesCapturer(); @@ -8951,7 +8953,7 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline } // used by getBestConfiguration above - private static void disposeOnEDT(final Frame f) + private static void disposeOnEDT(final Window f) { Runnable r = new Runnable() { @Override diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java index c3cd6ad..43eb579 100644 --- a/src/main/java/org/jogamp/java3d/JoglPipeline.java +++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java @@ -28,6 +28,7 @@ package org.jogamp.java3d; import java.awt.BorderLayout; import java.awt.Canvas; +import java.awt.Dialog; import java.awt.DisplayMode; import java.awt.EventQueue; import java.awt.Frame; @@ -35,6 +36,7 @@ import java.awt.GraphicsConfigTemplate; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; +import java.awt.Window; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -6545,7 +6547,7 @@ class JoglPipeline extends Pipeline { // TODO can't find an implementation which avoids the use of QueryCanvas // JOGL requires a visible Frame for an onscreen context - Frame f = new Frame(); + Dialog f = new Dialog(new Frame()); f.setUndecorated(true); f.setLayout(new BorderLayout()); @@ -8366,7 +8368,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) CapabilitiesCapturer capturer = null; AWTGraphicsConfiguration awtConfig = null; while (tryAgain) { - Frame f = new Frame(device.getDefaultConfiguration()); + Dialog f = new Dialog(new Frame(), null, false, device.getDefaultConfiguration()); f.setUndecorated(true); f.setLayout(new BorderLayout()); capturer = new CapabilitiesCapturer(); @@ -8728,7 +8730,7 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) } } - private void disposeOnEDT(final Frame f) { + private static void disposeOnEDT(final Window f) { Runnable r = new Runnable() { @Override public void run() { |