diff options
| author | Sven Gothel <[email protected]> | 2013-09-27 13:23:39 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-09-27 13:23:39 +0200 |
| commit | 9a8f9b9f7e6148b60b6f0f4326df8d213774284c (patch) | |
| tree | b8e060224a4a6a26cee30103fc6ae2ac0bd2e6f7 /jnlp-files | |
| parent | 4ef53cf2ae509a625795bfa3a8982ce75e24e83a (diff) | |
Bug 816: Fix JAWTWindow's getLocationOnScreenNonBlocking(); Derive CALayer position from AWT component's location on screen. Track fixedFrame size of root CALayer; Add Split layout to unit test, add [manual] Applet tests.
- Fix JAWTWindow's getLocationOnScreenNonBlocking()
Skip JRootPane while traversing up to root Container.
JRootPane would duplicate the top-level container's offset (Window insets).
- Derive CALayer position from AWT component's location on screen. Add Split layout to unit test, add [manual] Applet tests.
AWT >= 7u40:
- AWT position is top-left w/ insets, where CALayer position is bottom/left from root CALayer w/o insets.
- Use getLocationOnScreenNonBlocking() to get location-on-screen w/o insets.
- Native code: flip origin
AWT < 7u40 still uses fixed position 0/0 for root and sub layer.
- Track fixedFrame size of root CALayer - MyCALayer:
- Override layoutSublayers to validate root and sub-layer pos/size
- Override setFrame to use fixedFrame, if set (similar to MyNSOpenGLLayer)
- Add Split layout to unit test, add [manual] Applet tests.
- Thx to 'jimthev' and 'Manu' for providing Applet unit tests
Diffstat (limited to 'jnlp-files')
| -rw-r--r-- | jnlp-files/jogl-applet-bug816_glcanvas01.html | 32 | ||||
| -rw-r--r-- | jnlp-files/jogl-applet-bug816_glcanvas02.html | 32 | ||||
| -rw-r--r-- | jnlp-files/jogl-test-applets.html | 11 |
3 files changed, 75 insertions, 0 deletions
diff --git a/jnlp-files/jogl-applet-bug816_glcanvas01.html b/jnlp-files/jogl-applet-bug816_glcanvas01.html new file mode 100644 index 000000000..c460ff12c --- /dev/null +++ b/jnlp-files/jogl-applet-bug816_glcanvas01.html @@ -0,0 +1,32 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>Bug816 OSX CALayer Pos - Custom Bounds</title> +</head> +<body BGCOLOR="#ffffff"> + +<P> +Bug816 OSX CALayer Pos - Custom Bounds +</P> + +<P> +<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" + width="800" height="600"> + <param name="code" value="com.jogamp.opengl.test.junit.jogl.demos.es2.awt.Bug816AppletGLCanvas01"> + <param name="archive" value="jar/lib/gluegen-rt.jar, + jar/lib/jogl-all.jar, + jar/jogl-test.jar"> + <comment> + <embed code="com.jogamp.opengl.test.junit.jogl.demos.es2.awt.Bug816AppletGLCanvas01" + width="800" height="600" + type="application/x-java-applet;version=1.6" + archive="jar/gluegen-rt.jar, + jar/jogl-all.jar, + jar/jogl-test.jar"> + <noembed>Sorry, no Java support detected.</noembed> + </embed> + </comment> +</object> +</P> +</body> +</html> diff --git a/jnlp-files/jogl-applet-bug816_glcanvas02.html b/jnlp-files/jogl-applet-bug816_glcanvas02.html new file mode 100644 index 000000000..850b9752a --- /dev/null +++ b/jnlp-files/jogl-applet-bug816_glcanvas02.html @@ -0,0 +1,32 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>Bug816 OSX CALayer Pos - Box Layout</title> +</head> +<body BGCOLOR="#ffffff"> + +<P> +Bug816 OSX CALayer Pos - Box Layout +</P> + +<P> +<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" + width="800" height="600"> + <param name="code" value="com.jogamp.opengl.test.junit.jogl.demos.es2.awt.Bug816AppletGLCanvas02"> + <param name="archive" value="jar/lib/gluegen-rt.jar, + jar/lib/jogl-all.jar, + jar/jogl-test.jar"> + <comment> + <embed code="com.jogamp.opengl.test.junit.jogl.demos.es2.awt.Bug816AppletGLCanvas02" + width="800" height="600" + type="application/x-java-applet;version=1.6" + archive="jar/gluegen-rt.jar, + jar/jogl-all.jar, + jar/jogl-test.jar"> + <noembed>Sorry, no Java support detected.</noembed> + </embed> + </comment> +</object> +</P> +</body> +</html> diff --git a/jnlp-files/jogl-test-applets.html b/jnlp-files/jogl-test-applets.html index 132945e4e..69fb70eca 100644 --- a/jnlp-files/jogl-test-applets.html +++ b/jnlp-files/jogl-test-applets.html @@ -198,6 +198,17 @@ Click on the <i>Launch</i> link to actually launch the demo.<br/> </tbody></table> </div> +<p> +Misc tests: +<ul> + <li>Bug 816 - OSX CALayer Positioning Bug + <ul> + <li><a href="jogl-applet-bug816_glcanvas01.html">01: Custom bounds within applet</a></li> + <li><a href="jogl-applet-bug816_glcanvas02.html">02: Box layout within applet</a></li> + </ul></li> +</ul> +</p> + </div> <!-- text --> </div> <!-- main --> |